Bug 532101: [AFViewpoints] Make AF editor faster

Bug 532104: [AFViewpoints] Transform your Workspace reference to
platform
reference

- Simplified the AF model wizard by defaulting the root to be
Architecture Domain.
- Extended the Load Resource action in the AF editor to allow loading AF
models from the running platfom.
- Added a Resolve All action that can be used on any object in the
editor to quickly resolve related references. This can be used on a
loaded AF model (from workspace or running platform) to also load its
dependencies like elementtypeconfigurtion and palleteconfiguration
files.
- Made the architecture, elementtypesetconfigurtion,
nattableconfiguration, and paletteconfiguration resources extend of a
common base class that supports default load/save options. This base
class also makes the cross references persist using platform:/platform
URIs but upon load, they may  resolve to platform:/resource if the
resource is available in the workspace.
- Refactored uml.architecture, all the elementtypeconfiguration, all
palletteconfiguration, and all nattableconfiguration models by changing
their cross references to platform:/plugin URI format.
- Fixed PasteEObjectConfigurationItemProvider to make the containment
reference axisIdentifier show in the editor/property sheet as a
containment reference (was necessary to convert its cross references
properly)

Change-Id: I69b82f53670cbb81e9117ce82c61d7c898080c93
Signed-off-by: Maged Elaasar <melaasar@gmail.com>

77 files changed, 6732 insertions, 8444 deletions

diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
index c8bf5d850ea..d26afe76fb7 100755
--- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.uml.architecture;singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.200.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0
  org.eclipse.papyrus.infra.nattable.views.config;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.infra.services.controlmode;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.rulebased;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
@@ -30,11 +30,12 @@ Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0
  org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.nattable.representation;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.nattable.representation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.papyrus.uml.architecture
 Bundle-Vendor: %providerName
 Automatic-Module-Name: org.eclipse.papyrus.uml.architecture
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
index fa717597fd8..10d37da44ce 100644
--- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/model/uml.architecture
@@ -1,458 +1,458 @@
 <?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:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmi:id="_HQhf4MSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.softwareEngineering" name="Software Engineering" description="The domain of developing software systems" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/domain.gif">
-  <stakeholders xmi:id="_HQhf4cSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.softwareEngineering.softwareEngineer" name="Software Engineer" description="An engineer interested in software development" concerns="_HQhf4sSYEeaKZJ_pGfaSiA _HQhf48SYEeaKZJ_pGfaSiA _HQhf5MSYEeaKZJ_pGfaSiA"/>
-  <stakeholders xmi:id="_IigrMMSjEeaCPPhpB0_9OQ" id="org.eclipse.papyrus.softwareEngineering.domainArchitect" name="Domain Architect" concerns="_NxfRgMSjEeaCPPhpB0_9OQ"/>
-  <concerns xmi:id="_NxfRgMSjEeaCPPhpB0_9OQ" id="org.eclipse.papyrus.softwareEngineering.profiles" name="Profiles" description="The concern of defining the domain profiles"/>
-  <concerns xmi:id="_HQhf4sSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.softwareEngineering.useCases" name="Use Cases" description="The concern of defining the system's use cases"/>
-  <concerns xmi:id="_HQhf48SYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.softwareEngineering.structure" name="Structure" description="The concern of developing the system's structure"/>
-  <concerns xmi:id="_HQhf5MSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.softwareEngineering.behavior" name="Behavior" description="The concern of developing the system's behavior"/>
-  <contexts xsi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_HQhf5cSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.infra.services.edit.TypeContext" name="UML" description="The Unified Modeling Language" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/uml.gif" creationCommandClass="org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand">
-    <viewpoints xmi:id="_HQhf5sSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.uml.analysis" name="Software Analysis" description="A viewpoint allowing software analysis with UML" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_yeY0sHDvEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _P3J1cEb7EeRVGbM3cmVSqQ _Uz8agHDcEeWh-MssWmCB_A _P3J1cEa7EeSVGbM3cmVSqQ _WC1q0P4UEhSRsNBVzfUrzA _wXztQHDwEwWh-MssWmCB_A _d4-QwCT-EeedRqoTe_1ZiA"/>
-    <viewpoints xmi:id="_OOrIUMSZEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.uml.design" name="Software Design" description="A viewpoint allowing software design with UML" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_UzcgsHDtEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A _jRtroHDuEeWh-MssWmCB_A _fa4kAHDuEeWh-MssWmCB_A _fa4kBHDuEeWh-MssWmCB_A _bKiwMHDuEeWh-MssWmCB_A _bKiwNHDuEeWh-MssWmCB_A _ARGokHDuEeWh-MssWmCB_A _zzf4YHDtEeWh-MssWmCB_A _FuMjYHDuEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _TR15IHDvEeWh-MssWmCB_A _PwD0cHDvEeWh-MssWmCB_A _LzyMIHDvEeWh-MssWmCB_A _P3J1cEb7EeRVGbM3cmVSqQ _Uz8agHDcEeWh-MssWmCB_A _P3J1cEa7EeSVGbM3cmVSqQ _WC1q0P4UEhSRsNBVzfUrzA _wXztQHDwEwWh-MssWmCB_A _d4-QwCT-EeedRqoTe_1ZiA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations#_tL86sLazEeSbnofizoRSMQ"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations#_wYwtMMeDEeSwP_9Vn5UnWg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>
-    <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.uml.diagram.sequence/model/SequenceDiagram.elementtypesconfigurations#_uuwoQENKEeimO7ZhVBpjkg"/>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UzcgsHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.activity" name="Activity Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLActivityDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand">
-      <modelRules xmi:id="_UzcgsXDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:environment="http://www.eclipse.org/papyrus/constraints/environment/0.9" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" xmlns:representation="http://www.eclipse.org/papyrus/infra/core/architecture/representation" xmi:id="_HQhf4MSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.softwareEngineering" name="Software Engineering" description="The domain of developing software systems" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/domain.gif">
+  <stakeholders xmi:type="architecture:Stakeholder" xmi:id="_HQhf4cSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.softwareEngineering.softwareEngineer" name="Software Engineer" description="An engineer interested in software development" concerns="_HQhf4sSYEeaKZJ_pGfaSiA _HQhf48SYEeaKZJ_pGfaSiA _HQhf5MSYEeaKZJ_pGfaSiA"/>
+  <stakeholders xmi:type="architecture:Stakeholder" xmi:id="_IigrMMSjEeaCPPhpB0_9OQ" id="org.eclipse.papyrus.softwareEngineering.domainArchitect" name="Domain Architect" concerns="_NxfRgMSjEeaCPPhpB0_9OQ"/>
+  <concerns xmi:type="architecture:Concern" xmi:id="_NxfRgMSjEeaCPPhpB0_9OQ" id="org.eclipse.papyrus.softwareEngineering.profiles" name="Profiles" description="The concern of defining the domain profiles"/>
+  <concerns xmi:type="architecture:Concern" xmi:id="_HQhf4sSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.softwareEngineering.useCases" name="Use Cases" description="The concern of defining the system's use cases"/>
+  <concerns xmi:type="architecture:Concern" xmi:id="_HQhf48SYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.softwareEngineering.structure" name="Structure" description="The concern of developing the system's structure"/>
+  <concerns xmi:type="architecture:Concern" xmi:id="_HQhf5MSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.softwareEngineering.behavior" name="Behavior" description="The concern of developing the system's behavior"/>
+  <contexts xmi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_HQhf5cSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.infra.services.edit.TypeContext" name="UML" description="The Unified Modeling Language" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/uml.gif" creationCommandClass="org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand">
+    <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_HQhf5sSYEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.uml.analysis" name="Software Analysis" description="A viewpoint allowing software analysis with UML" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_yeY0sHDvEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _P3J1cEb7EeRVGbM3cmVSqQ _Uz8agHDcEeWh-MssWmCB_A _P3J1cEa7EeSVGbM3cmVSqQ _WC1q0P4UEhSRsNBVzfUrzA _wXztQHDwEwWh-MssWmCB_A _d4-QwCT-EeedRqoTe_1ZiA"/>
+    <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_OOrIUMSZEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.uml.design" name="Software Design" description="A viewpoint allowing software design with UML" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_UzcgsHDtEeWh-MssWmCB_A _zzf4gHDtEeWh-MssWmCB_A _jRtroHDuEeWh-MssWmCB_A _fa4kAHDuEeWh-MssWmCB_A _fa4kBHDuEeWh-MssWmCB_A _bKiwMHDuEeWh-MssWmCB_A _bKiwNHDuEeWh-MssWmCB_A _ARGokHDuEeWh-MssWmCB_A _zzf4YHDtEeWh-MssWmCB_A _FuMjYHDuEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _TR15IHDvEeWh-MssWmCB_A _PwD0cHDvEeWh-MssWmCB_A _LzyMIHDvEeWh-MssWmCB_A _P3J1cEb7EeRVGbM3cmVSqQ _Uz8agHDcEeWh-MssWmCB_A _P3J1cEa7EeSVGbM3cmVSqQ _WC1q0P4UEhSRsNBVzfUrzA _wXztQHDwEwWh-MssWmCB_A _d4-QwCT-EeedRqoTe_1ZiA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontents.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable/model/nattable-tablecontext.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.common/model/nattable-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations#_tL86sLazEeSbnofizoRSMQ"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations#_x8G0YGaNEeSyJIsxLao1Pw"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations#_wYwtMMeDEeSwP_9Vn5UnWg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations#_BJMa0PyeEeWbo9Y7g2MLdw"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/SequenceDiagram.elementtypesconfigurations#_uuwoQENKEeimO7ZhVBpjkg"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UzcgsHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.activity" name="Activity Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/icons/obj16/Diagram_Activity.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLActivityDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.activity.CreateActivityDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_UzcgsXDtEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
       </modelRules>
-      <owningRules xmi:id="_UzcgsnDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_UzcgsnDtEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
       </owningRules>
-      <owningRules xmi:id="_Uzcgs3DtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_UzcgtHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_Uzcgs3DtEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_UzcgtHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_UzcgtXDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_UzcgtnDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_UzcgtXDtEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_UzcgtnDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_Uzcgt3DtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_UzcguHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_Uzcgt3DtEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_UzcguHDtEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
         </newModelPath>
       </owningRules>
-      <childRules xmi:id="_UzcguXDtEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/PapyrusUMLActivityDiagram.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_UzcguXDtEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.activity/model/PapyrusUMLActivityDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4gHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.class" name="Class Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
-      <modelRules xmi:id="_zzf4gXDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4gHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.class" name="Class Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_zzf4gXDtEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
-      <owningRules xmi:id="_zzf4gnDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_zzf4gnDtEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <childRules xmi:id="_zzf4g3DtEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_zzf4g3DtEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4YHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.innerClass" name="Inner Class Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
-      <modelRules xmi:id="_zzf4YXDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4YHDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.innerClass" name="Inner Class Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/icons/obj16/Diagram_Class.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_zzf4YXDtEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
       </modelRules>
-      <owningRules xmi:id="_zzf4YnDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_zzf4YnDtEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
       </owningRules>
-      <owningRules xmi:id="_zzf4Y3DtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_zzf4Y3DtEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <childRules xmi:id="_zzf4ZHDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        <insertionPath xmi:id="_zzf4ZXDtEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_zzf4ZHDtEeWh-MssWmCB_A" permit="true">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
+        <origin xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <insertionPath xmi:type="gmfdiagrepresentation:PathElement" xmi:id="_zzf4ZXDtEeWh-MssWmCB_A">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
         </insertionPath>
       </childRules>
-      <childRules xmi:id="_zzf4ZnDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-        <insertionPath xmi:id="_zzf4Z3DtEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_zzf4ZnDtEeWh-MssWmCB_A" permit="true">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
+        <origin xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+        <insertionPath xmi:type="gmfdiagrepresentation:PathElement" xmi:id="_zzf4Z3DtEeWh-MssWmCB_A">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
         </insertionPath>
       </childRules>
-      <paletteRules xmi:id="_zzf4aHDtEeWh-MssWmCB_A" element="clazz.tool.class"/>
-      <paletteRules xmi:id="_zzf4aXDtEeWh-MssWmCB_A" element="clazz.tool.comment"/>
-      <paletteRules xmi:id="_zzf4anDtEeWh-MssWmCB_A" element="clazz.tool.interface"/>
-      <paletteRules xmi:id="_zzf4a3DtEeWh-MssWmCB_A" element="clazz.tool.abstraction"/>
-      <paletteRules xmi:id="_zzf4bHDtEeWh-MssWmCB_A" element="clazz.tool.association"/>
-      <paletteRules xmi:id="_zzf4bXDtEeWh-MssWmCB_A" element="clazz.tool.generalization"/>
-      <paletteRules xmi:id="_zzf4bnDtEeWh-MssWmCB_A" element="clazz.tool.generalizationset"/>
-      <paletteRules xmi:id="_zzf4b3DtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>
-      <paletteRules xmi:id="_zzf4cHDtEeWh-MssWmCB_A" element=""/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration#/"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4aHDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.class"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4aXDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.comment"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4anDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.interface"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4a3DtEeWh-MssWmCB_A" permit="true" element="clazz.tool.abstraction"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4bHDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.association"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4bXDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.generalization"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4bnDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.generalizationset"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4b3DtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4cHDtEeWh-MssWmCB_A" permit="true" element=""/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4cXDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.package" name="Package Diagram" icon="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Diagram_Package.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
-      <modelRules xmi:id="_zzf4cnDtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_zzf4cXDtEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.package" name="Package Diagram" icon="platform:/plugin/org.eclipse.papyrus.infra.viewpoints.policy/icons/Diagram_Package.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_zzf4cnDtEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
-      <owningRules xmi:id="_zzf4c3DtEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-      </owningRules>
-      <childRules xmi:id="_zzf4dHDtEeWh-MssWmCB_A"/>
-      <paletteRules xmi:id="_zzf4dXDtEeWh-MssWmCB_A" element="clazz.tool.comment"/>
-      <paletteRules xmi:id="_zzf4dnDtEeWh-MssWmCB_A" element="clazz.tool.constraint"/>
-      <paletteRules xmi:id="_zzf4d3DtEeWh-MssWmCB_A" element="clazz.tool.model"/>
-      <paletteRules xmi:id="_zzf4eHDtEeWh-MssWmCB_A" element="clazz.tool.package"/>
-      <paletteRules xmi:id="_zzf4eXDtEeWh-MssWmCB_A" element="clazz.tool.abstraction"/>
-      <paletteRules xmi:id="_zzf4enDtEeWh-MssWmCB_A" element="clazz.tool.dependency"/>
-      <paletteRules xmi:id="_zzf4e3DtEeWh-MssWmCB_A" element="clazz.tool.packageimport"/>
-      <paletteRules xmi:id="_zzf4fHDtEeWh-MssWmCB_A" element="clazz.tool.link"/>
-      <paletteRules xmi:id="_zzf4fXDtEeWh-MssWmCB_A" element="clazz.tool.containmentlink"/>
-      <paletteRules xmi:id="_zzf4fnDtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>
-      <paletteRules xmi:id="_-p3PYHBqEee8uorOJUenzw" permit="false" element="createTimeObservation22CreationTool"/>
-      <paletteRules xmi:id="_BI754HBrEee8uorOJUenzw" permit="false" element="createDurationObservation7CreationTool"/>
-      <paletteRules xmi:id="_zzf4f3DtEeWh-MssWmCB_A" element=""/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration#/"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_zzf4c3DtEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      </owningRules>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_zzf4dHDtEeWh-MssWmCB_A" permit="true"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4dXDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.comment"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4dnDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.constraint"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4d3DtEeWh-MssWmCB_A" permit="true" element="clazz.tool.model"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4eHDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.package"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4eXDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.abstraction"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4enDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.dependency"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4e3DtEeWh-MssWmCB_A" permit="true" element="clazz.tool.packageimport"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4fHDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.link"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4fXDtEeWh-MssWmCB_A" permit="true" element="clazz.tool.containmentlink"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4fnDtEeWh-MssWmCB_A" permit="false" element="clazz.tool.*"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_-p3PYHBqEee8uorOJUenzw" permit="false" element="createTimeObservation22CreationTool"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_BI754HBrEee8uorOJUenzw" permit="false" element="createDurationObservation7CreationTool"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_zzf4f3DtEeWh-MssWmCB_A" permit="true" element=""/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_jRtroHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.communication" name="Communication Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLCommunicationDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand">
-      <modelRules xmi:id="_jRtroXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_jRtroHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.communication" name="Communication Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/icons/obj16/Diagram_Communication.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLCommunicationDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.communication.CreateCommunicationDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_jRtroXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
       </modelRules>
-      <owningRules xmi:id="_jRtronDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_jRtronDuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
       </owningRules>
-      <owningRules xmi:id="_jRtro3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_jRtrpHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_jRtro3DuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_jRtrpHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_jRtrpXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_jRtrpnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_jRtrpXDuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_jRtrpnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_jRtrp3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_jRtrqHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_jRtrp3DuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_jRtrqHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
         </newModelPath>
       </owningRules>
-      <childRules xmi:id="_jRtrqXDuEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/PapyrusUMLCommunicationDiagram.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_jRtrqXDuEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/PapyrusUMLCommunicationDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kAHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.component.root.package" name="Component Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">
-      <modelRules xmi:id="_fa4kAXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kAHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.component.root.package" name="Component Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_fa4kAXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
-      <owningRules xmi:id="_fa4kAnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_fa4kAnDuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <childRules xmi:id="_fa4kA3DuEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/model/PapyrusUMLComponentDiagram.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_fa4kA3DuEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/model/PapyrusUMLComponentDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kBHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.component.root.component" name="Component Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">
-      <modelRules xmi:id="_fa4kBXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_fa4kBHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.component.root.component" name="Component Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.component/icons/obj16/ComponentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLComponentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.component.CreateComponentDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_fa4kBXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
       </modelRules>
-      <owningRules xmi:id="_fa4kBnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_fa4kBnDuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
       </owningRules>
-      <owningRules xmi:id="_fa4kB3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_fa4kB3DuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <childRules xmi:id="_fa4kCHDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-        <insertionPath xmi:id="_fa4kCXDuEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_fa4kCHDuEeWh-MssWmCB_A" permit="true">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
+        <origin xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+        <insertionPath xmi:type="gmfdiagrepresentation:PathElement" xmi:id="_fa4kCXDuEeWh-MssWmCB_A">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
         </insertionPath>
       </childRules>
-      <childRules xmi:id="_fa4kCnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-        <insertionPath xmi:id="_fa4kC3DuEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_fa4kCnDuEeWh-MssWmCB_A" permit="true">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
+        <origin xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+        <insertionPath xmi:type="gmfdiagrepresentation:PathElement" xmi:id="_fa4kC3DuEeWh-MssWmCB_A">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedComment"/>
         </insertionPath>
       </childRules>
-      <childRules xmi:id="_fa4kDHDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-        <insertionPath xmi:id="_fa4kDXDuEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_fa4kDHDuEeWh-MssWmCB_A" permit="true">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>
+        <origin xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+        <insertionPath xmi:type="gmfdiagrepresentation:PathElement" xmi:id="_fa4kDXDuEeWh-MssWmCB_A">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedRule"/>
         </insertionPath>
       </childRules>
-      <childRules xmi:id="_fa4kDnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>
-        <origin href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-        <insertionPath xmi:id="_fa4kD3DuEeWh-MssWmCB_A">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_fa4kDnDuEeWh-MssWmCB_A" permit="true">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>
+        <origin xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
+        <insertionPath xmi:type="gmfdiagrepresentation:PathElement" xmi:id="_fa4kD3DuEeWh-MssWmCB_A">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
         </insertionPath>
       </childRules>
-      <paletteRules xmi:id="_fa4kEHDuEeWh-MssWmCB_A" permit="false" element="component.tool.model"/>
-      <paletteRules xmi:id="_fa4kEXDuEeWh-MssWmCB_A" permit="false" element="component.tool.package"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_fa4kEHDuEeWh-MssWmCB_A" permit="false" element="component.tool.model"/>
+      <paletteRules xmi:type="gmfdiagrepresentation:PaletteRule" xmi:id="_fa4kEXDuEeWh-MssWmCB_A" permit="false" element="component.tool.package"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwMHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.compositeStructure.root.package" name="Composite Structure Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
-      <modelRules xmi:id="_bKiwMXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwMHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.compositeStructure.root.package" name="Composite Structure Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_bKiwMXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
-      <owningRules xmi:id="_bKiwMnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_bKiwMnDuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <childRules xmi:id="_bKiwM3DuEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/CompositeStructure.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_bKiwM3DuEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/model/CompositeStructure.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwNHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.compositeStructure.root.structuredClassifier" name="Composite Structure Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
-      <modelRules xmi:id="_bKiwNXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_bKiwNHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.compositeStructure.root.structuredClassifier" name="Composite Structure Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.composite/icons/obj16/Diagram_CompositeStructure.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="CompositeStructure" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_bKiwNXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
       </modelRules>
-      <owningRules xmi:id="_bKiwNnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_bKiwNnDuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
       </owningRules>
-      <owningRules xmi:id="_bKiwN3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_bKiwN3DuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <childRules xmi:id="_bKiwOHDuEeWh-MssWmCB_A"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_bKiwOHDuEeWh-MssWmCB_A" permit="true"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_ARGokHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.deployment" name="Deployment Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLDeploymentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand">
-      <modelRules xmi:id="_ARGokXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_ARGokHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.deployment" name="Deployment Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/icons/obj16/DeploymentDiagram.gif" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLDeploymentDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.deployment.CreateDeploymentDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_ARGokXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
-      <owningRules xmi:id="_ARGoknDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_ARGoknDuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <childRules xmi:id="_ARGok3DuEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/model/PapyrusUMLDeploymentDiagram.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_ARGok3DuEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.deployment/model/PapyrusUMLDeploymentDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_FuMjYHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.interactionOverview" name="Interaction Overview Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLInteractionOverviewDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand">
-      <modelRules xmi:id="_FuMjYXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_FuMjYHDuEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.interactionOverview" name="Interaction Overview Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/icons/obj16/interactionOverviewDiagram.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLInteractionOverviewDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.interactionoverview.InteractionOverviewDiagramCreateCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_FuMjYXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
       </modelRules>
-      <owningRules xmi:id="_FuMjYnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_FuMjYnDuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
       </owningRules>
-      <owningRules xmi:id="_FuMjY3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_FuMjZHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_FuMjY3DuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_FuMjZHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_FuMjZXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_FuMjZnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_FuMjZXDuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_FuMjZnDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_FuMjZ3DuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_FuMjaHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_FuMjZ3DuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_FuMjaHDuEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Activity">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
         </newModelPath>
       </owningRules>
-      <childRules xmi:id="_FuMjaXDuEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/PapyrusInteractionOverviewDiagram.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_FuMjaXDuEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/PapyrusInteractionOverviewDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UekVgHDwEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.profile" name="Profile Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile.gif" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" implementationID="PapyrusUMLProfileDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand">
-      <modelRules xmi:id="_UekVgXDwEeWh-MssWmCB_A">
-        <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_UekVgnDwEeWh-MssWmCB_A" name="IsContainedByProfile">
-          <constraintType href="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>
-          <properties xsi:type="constraints:ValueProperty" xmi:id="_UekVg3DwEeWh-MssWmCB_A" name="className" value="org.eclipse.papyrus.infra.viewpoints.policy.query.IsContainedByProfileQuery"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_UekVgHDwEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.profile" name="Profile Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/icons/obj16/Diagram_Profile.gif" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" implementationID="PapyrusUMLProfileDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_UekVgXDwEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <constraints xmi:type="constraints:SimpleConstraint" xmi:id="_UekVgnDwEeWh-MssWmCB_A" name="IsContainedByProfile" overrideable="true">
+          <constraintType xmi:type="environment:ConstraintType" href="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>
+          <properties xmi:type="constraints:ValueProperty" xmi:id="_UekVg3DwEeWh-MssWmCB_A" name="className" value="org.eclipse.papyrus.infra.viewpoints.policy.query.IsContainedByProfileQuery"/>
         </constraints>
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
-      <owningRules xmi:id="_UekVhHDwEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_UekVhHDwEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <owningRules xmi:id="_UekVhXDwEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Profile"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_UekVhXDwEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Profile"/>
       </owningRules>
-      <childRules xmi:id="_UekVhnDwEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/model/PapyrusUMLProfileDiagram.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_UekVhnDwEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.profile/model/PapyrusUMLProfileDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_TR15IHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.sequence" name="Sequence Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLSequenceDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand">
-      <modelRules xmi:id="_TR15IXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_TR15IHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.sequence" name="Sequence Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/icons/obj16/Diagram_Sequence.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLSequenceDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.sequence.CreateSequenceDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_TR15IXDvEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
       </modelRules>
-      <owningRules xmi:id="_TR15InDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_TR15InDvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
       </owningRules>
-      <owningRules xmi:id="_TR15I3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_TR15JHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_TR15I3DvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_TR15JHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_TR15JXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_TR15JnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_TR15JXDvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_TR15JnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_TR15J3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_TR15KHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_TR15J3DvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_TR15KHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_TR15KXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//UseCase"/>
-        <newModelPath xmi:id="_TR15KnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_TR15KXDvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//UseCase"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_TR15KnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.Interaction">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
         </newModelPath>
       </owningRules>
-      <childRules xmi:id="_TR15K3DvEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_TR15K3DvEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_PwD0cHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.stateMachine" name="State Machine Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLStateMachineDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand">
-      <modelRules xmi:id="_PwD0cXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_PwD0cHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.stateMachine" name="State Machine Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/icons/obj16/Diagram_StateMachine.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLStateMachineDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.statemachine.CreateStateMachineDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_PwD0cXDvEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
       </modelRules>
-      <modelRules xmi:id="_H-oCgB0UEea_bcpknMJ7-w">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_H-oCgB0UEea_bcpknMJ7-w" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
       </modelRules>
-      <owningRules xmi:id="_PwD0cnDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_PwD0cnDvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
       </owningRules>
-      <owningRules xmi:id="_PwD0c3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_PwD0dHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_PwD0c3DvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_PwD0dHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_PwD0dXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-        <newModelPath xmi:id="_PwD0dnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_PwD0dXDvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_PwD0dnDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_PwD0d3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-        <newModelPath xmi:id="_PwD0eHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_PwD0d3DvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_PwD0eHDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.StateMachine">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_PwD0eXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-        <newModelPath xmi:id="_PwD0enDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.ProtocolStateMachine">
-          <feature href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface/protocol"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_PwD0eXDvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
+        <newModelPath xmi:type="representation:ModelAutoCreate" xmi:id="_PwD0enDvEeWh-MssWmCB_A" creationType="org.eclipse.papyrus.uml.ProtocolStateMachine">
+          <feature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface/protocol"/>
         </newModelPath>
       </owningRules>
-      <owningRules xmi:id="_5kmMcB0UEea_bcpknMJ7-w">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_5kmMcB0UEea_bcpknMJ7-w" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
       </owningRules>
-      <childRules xmi:id="_PwD0e3DvEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/PapyrusUMLStateMachineDiagram.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_PwD0e3DvEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/PapyrusUMLStateMachineDiagram.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_LzyMIHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.timing" name="Timing Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLTimingDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.timing.custom.CreateTimingDiagramCommand">
-      <modelRules xmi:id="_LzyMIXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_LzyMIHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.timing" name="Timing Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.timing/icons/obj16/Diagram_Timing.gif" concerns="_HQhf5MSYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLTimingDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.timing.custom.CreateTimingDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_LzyMIXDvEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
-      <owningRules xmi:id="_LzyMInDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_LzyMInDvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <childRules xmi:id="_LzyMI3DvEeWh-MssWmCB_A"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_LzyMI3DvEeWh-MssWmCB_A" permit="true"/>
     </representationKinds>
-    <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_yeY0sHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.useCase" name="Use Case Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase.gif" concerns="_HQhf4sSYEeaKZJ_pGfaSiA" implementationID="UseCase" customStyle="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/usecase.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand">
-      <modelRules xmi:id="_yeY0sXDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+    <representationKinds xmi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="_yeY0sHDvEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.diagram.useCase" name="Use Case Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase.gif" concerns="_HQhf4sSYEeaKZJ_pGfaSiA" implementationID="UseCase" customStyle="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/usecase.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_yeY0sXDvEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
-      <modelRules xmi:id="_yeY0snDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_yeY0snDvEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
       </modelRules>
-      <owningRules xmi:id="_yeY0s3DvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_yeY0s3DvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <owningRules xmi:id="_yeY0tHDvEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_yeY0tHDvEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
       </owningRules>
-      <childRules xmi:id="_yeY0tXDvEeWh-MssWmCB_A"/>
-      <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/UseCase.paletteconfiguration#/"/>
+      <childRules xmi:type="gmfdiagrepresentation:ChildRule" xmi:id="_yeY0tXDvEeWh-MssWmCB_A" permit="true"/>
+      <palettes xmi:type="paletteconfiguration:PaletteConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/UseCase.paletteconfiguration#/"/>
     </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEa7EeSVGbM3cmVSqQ" id="org.eclipse.papyrus.uml.table.genericTree" name="Generic Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLGenericTreeTable">
-      <modelRules xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEa7EeSVGbM3cmVSqQ" id="org.eclipse.papyrus.uml.table.genericTree" name="Generic Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusUMLGenericTreeTable">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
       </modelRules>
-      <owningRules xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
       </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#/"/>
+      <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration#PapyrusUMLGenericTreeTable_XMI_ID"/>
     </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEb7EeRVGbM3cmVSqQ" id="org.eclipse.papyrus.uml.table.classTree" name="Class Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusClassTreeTable">
-      <modelRules xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_P3J1cEb7EeRVGbM3cmVSqQ" id="org.eclipse.papyrus.uml.table.classTree" name="Class Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusClassTreeTable">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_vZwgkEr7EeSVGbM3cmVSqQ" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
-      <owningRules xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_vZwgkUr7EeSVGbM3cmVSqQ" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#/"/>
+      <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#PapyrusClassTreeTable_XMI_ID"/>
     </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_Uz8agHDcEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.table.generic" name="Generic Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusGenericTable">
-      <modelRules xmi:id="_Uz8agXDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_Uz8agHDcEeWh-MssWmCB_A" id="org.eclipse.papyrus.uml.table.generic" name="Generic Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusGenericTable">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_Uz8agXDuEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
       </modelRules>
-      <owningRules xmi:id="_Uz8agnDuEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_Uz8agnDuEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
       </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+      <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#PapyrusGenericTable_XMI_ID"/>
     </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_WC1q0P4UEhSRsNBVzfUrzA" id="org.eclipse.papyrus.uml.table.stereotypeDisplayTree" name="Stereotype Display Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" implementationID="PapyrusStereotypeDisplayTreeTable">
-      <modelRules xmi:id="_7k79wP4VEeSRsNBVzfUrzA">
-        <element href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View"/>
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_WC1q0P4UEhSRsNBVzfUrzA" id="org.eclipse.papyrus.uml.table.stereotypeDisplayTree" name="Stereotype Display Tree Table" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/icons/uml_generic_table.png" concerns="_NxfRgMSjEeaCPPhpB0_9OQ" implementationID="PapyrusStereotypeDisplayTreeTable">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_7k79wP4VEeSRsNBVzfUrzA" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//View"/>
       </modelRules>
-      <owningRules xmi:id="_AJmbwP4WEeSRsNBVzfUrzA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_AJmbwP4WEeSRsNBVzfUrzA" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
       </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotype.nattableconfiguration#/"/>
+      <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.stereotype.display/config/stereotype.nattableconfiguration#PapyrusStereotypeDisplayTreeTable_XMI_ID"/>
     </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_wXztQHDwEwWh-MssWmCB_A" id="org.eclipse.papyrus.uml.table.view" name="View Table" icon="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusViewsTable">
-      <modelRules xmi:id="_wXztQXDwEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_wXztQHDwEwWh-MssWmCB_A" id="org.eclipse.papyrus.uml.table.view" name="View Table" icon="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/icons/nattablepageeditor.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="PapyrusViewsTable">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_wXztQXDwEeWh-MssWmCB_A" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
       </modelRules>
-      <owningRules xmi:id="_wXztQnDwEeWh-MssWmCB_A">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_wXztQnDwEeWh-MssWmCB_A" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
       </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>
+      <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#PapyrusViewsTable_XMI_ID"/>
     </representationKinds>
-    <representationKinds xsi:type="nattablerepresentation:PapyrusTable" xmi:id="_d4-QwCT-EeedRqoTe_1ZiA" id="org.eclipse.papyrus.uml.table.matrix" name="Relationship Generic Matrix" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/icons/uml_generic_matrix_relationships.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="UMLGenericMatrixOfRelationships">
-      <modelRules xmi:id="_d4-QwST-EeedRqoTe_1ZiA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+    <representationKinds xmi:type="nattablerepresentation:PapyrusTable" xmi:id="_d4-QwCT-EeedRqoTe_1ZiA" id="org.eclipse.papyrus.uml.table.matrix" name="Relationship Generic Matrix" icon="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/icons/uml_generic_matrix_relationships.png" concerns="_HQhf48SYEeaKZJ_pGfaSiA" implementationID="UMLGenericMatrixOfRelationships">
+      <modelRules xmi:type="representation:ModelRule" xmi:id="_d4-QwST-EeedRqoTe_1ZiA" permit="true" elementMultiplicity="1" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </modelRules>
-      <owningRules xmi:id="_d4-QwiT-EeedRqoTe_1ZiA">
-        <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+      <owningRules xmi:type="representation:OwningRule" xmi:id="_d4-QwiT-EeedRqoTe_1ZiA" permit="true" multiplicity="-1">
+        <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
       </owningRules>
-      <configuration href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#/"/>
+      <configuration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.matrix/configs/generic_matrix_of_relationships.nattableconfiguration#UMLGenericMatrixOfRelationships_XMI_ID"/>
     </representationKinds>
-    <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
+    <metamodel xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
   </contexts>
-  <contexts xsi:type="architecture:ArchitectureFramework" xmi:id="__ZqwAMSlEeaCPPhpB0_9OQ" id="org.eclipse.papyrus.uml.architecture.Profile" name="Profile" description="The Profile Definition Framework" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/profile.gif" extensionPrefix="profile" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand">
-    <viewpoints xmi:id="_hoXx0MSiEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.uml.profile.definition" name="Profile Definition" description="A viewpoint allowing profile definition with UML" representationKinds="_UekVgHDwEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _P3J1cEa7EeSVGbM3cmVSqQ"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
-    <elementTypes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
-    <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"/>
+  <contexts xmi:type="architecture:ArchitectureFramework" xmi:id="__ZqwAMSlEeaCPPhpB0_9OQ" id="org.eclipse.papyrus.uml.architecture.Profile" name="Profile" description="The Profile Definition Framework" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/profile.gif" extensionPrefix="profile" creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand">
+    <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_hoXx0MSiEeaKZJ_pGfaSiA" id="org.eclipse.papyrus.uml.profile.definition" name="Profile Definition" description="A viewpoint allowing profile definition with UML" representationKinds="_UekVgHDwEeWh-MssWmCB_A _zzf4cXDtEeWh-MssWmCB_A _P3J1cEa7EeSVGbM3cmVSqQ"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.services.controlmode/model/controlmode.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.services.edit/model/marker.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.types.rulebased/model/rulebased.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations#_jfoLkGT_EeSEqNuV3JpFCA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations#_ScP1oFYCEeS0WsAAtVmToA"/>
   </contexts>
 </architecture:ArchitectureDomain>
diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/pom.xml b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/pom.xml
index 013f9c9d041..39179c9db54 100644
--- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/pom.xml
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.architecture</artifactId>
-	<version>1.1.100-SNAPSHOT</version>
+	<version>1.1.200-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
index 6a0fe028499..284591eb7cd 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF
@@ -42,7 +42,7 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/PapyrusUMLActivityDiagram.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/PapyrusUMLActivityDiagram.paletteconfiguration
index ac3527bdc4c..4d023ef556f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/PapyrusUMLActivityDiagram.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/PapyrusUMLActivityDiagram.paletteconfiguration
@@ -1,1302 +1,747 @@
-<?xml version="1.0" encoding="ASCII"?>
-<?gmfgen generated="true"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8"
-	xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
-	id="org.eclipse.papyrus.uml.diagram.activity.paletteconfiguration"
-	label="Papyrus activity editor Plugin Palette"
-	description="This is the palette of Papyrus activity editor Plugin">
-	<drawerConfigurations
-		id="activity.nodes"
-		label="Nodes"
-		description="">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.activitygroup" label="ActivityGroup">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.activitygroup.activitypartition" 
-				label="Activity Partition"
-				description="Create an Activity Partition">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityPartition_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.activitygroup.interruptibleactivityregion" 
-				label="Interruptible Activity Region"
-				description="Create an Interruptible Activity Region">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.controlnodes" label="ControlNodes">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.controlnodes.initialnode" 
-				label="Initial node"
-				description="Create an Initial node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InitialNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.controlnodes.activityfinal" 
-				label="Activity final"
-				description="Create an Activity final node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityFinalNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityFinalNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.controlnodes.flowfinal" 
-				label="Flow final"
-				description="Create a Flow final node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FlowFinalNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.controlnodes.decisionnode" 
-				label="Decision node"
-				description="Create a Decision node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DecisionNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.controlnodes.mergenode" 
-				label="Merge node"
-				description="Create a Merge node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.MergeNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.controlnodes.joinnode" 
-				label="Join node"
-				description="Create a Merge node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.JoinNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.controlnodes.forknode" 
-				label="Fork node"
-				description="Create a Fork node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ForkNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.constraints" label="Constraints">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.constraints.localpreconditionconstraint" 
-				label="Local Precondition Constraint"
-				description="Create a Constraint as Local Precondition for an Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_LocalPreconditionShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.constraints.localpreconditionintervalconstraint" 
-				label="Local Precondition Interval Constraint"
-				description="Create an Interval Constraint as Local Precondition for an Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.IntervalConstraint_LocalPreconditionShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.constraints.localpreconditiondurationconstraint" 
-				label="Local Precondition Duration Constraint"
-				description="Create a Duration Constraint as Local Precondition for an Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationConstraint_LocalPreconditionShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.constraints.localpreconditiontimeconstraint" 
-				label="Local Precondition Time Constraint"
-				description="Create a Time Constraint as Local Precondition for an Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeConstraint_LocalPreconditionShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.constraints.localpostconditionconstraint" 
-				label="Local Postcondition Constraint"
-				description="Create a Constraint as Local Postcondition for an Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_LocalPostconditionShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.constraints.localpostconditionintervalconstraint" 
-				label="Local Postcondition Interval Constraint"
-				description="Create an Interval Constraint as Local Postcondition for an Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.IntervalConstraint_LocalPostconditionShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.constraints.localpostconditiondurationconstraint" 
-				label="Local Postcondition Duration Constraint"
-				description="Create a Duration Constraint as Local Postcondition for an Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationConstraint_LocalPostconditionShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.constraints.localpostconditiontimeconstraint" 
-				label="Local Postcondition Time Constraint"
-				description="Create a Time Constraint as Local Postcondition for an Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeConstraint_LocalPostconditionShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.pins" label="Pins">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.pins.outputpin" 
-				label="Output Pin"
-				description="Create an Output Pin">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReduceActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_LoopNodeVariableShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_LoopNodeResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_StructuredActivityNodeOutputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionResultShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_UnmarshallActionResultShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.pins.inputpin" 
-				label="Input Pin"
-				description="Create an Input Pin">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_TestIdentityActionFirstShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_TestIdentityActionSecondShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CreateLinkActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReadLinkActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_DestroyLinkActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReduceActionCollectionShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInsertAtShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionValueShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionInsertAtShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StructuredActivityNodeInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CreateLinkObjectActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_UnmarshallActionObjectShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.pins.actioninputpin" 
-				label="Action Input Pin"
-				description="Create an Action Input Pin">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_OpaqueActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionFirstShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionSecondShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ClearStructuralFeatureActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_DestroyLinkActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ClearAssociationActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ReclassifyObjectActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ReadIsClassifiedObjectActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ReduceActionCollectionShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_StartClassifierBehaviorActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_DestroyObjectActionTargetShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionInsertAtShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionValueShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_BroadcastSignalActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionValueShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionInsertAtShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_LoopNodeVariableInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_StructuredActivityNodeInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkObjectActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ReadStructuralFeatureActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_UnmarshallActionObjectShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.pins.valuepin" 
-				label="Value Pin"
-				description="Create a Value Pin">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_OpaqueActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_CallOperationActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_SendSignalActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionFirstShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionSecondShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ClearStructuralFeatureActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_CreateLinkActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ReadLinkActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_DestroyLinkActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ClearAssociationActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ReclassifyObjectActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ReadIsClassifiedObjectActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ReduceActionCollectionShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_StartClassifierBehaviorActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_DestroyObjectActionTargetShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionInsertAtShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionValueShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_BroadcastSignalActionArgumentShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionValueShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionInsertAtShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_LoopNodeVariableInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_StructuredActivityNodeInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_CreateLinkObjectActionInputShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ReadStructuralFeatureActionObjectShape"/>
-				</elementDescriptors>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_UnmarshallActionObjectShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.expansionregions" label="ExpansionRegions">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.expansionregions.expansionregion" 
-				label="Expansion Region"
-				description="Create an Expansion Region">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExpansionRegion_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.expansionregions.inputexpansionnode" 
-				label="Input Expansion Node"
-				description="Create an Expansion Node as Input of an Expansion Region">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExpansionNode_InputShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.expansionregions.outputexpansionnode" 
-				label="Output Expansion Node"
-				description="Create an Expansion Node as Output of an Expansion Region">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExpansionNode_OutputShape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.invocationactions" label="InvocationActions">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.invocationactions.broadcastsignalaction" 
-				label="Broadcast Signal Action"
-				description="Create a Broadcast Signal Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BroadcastSignalAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.BroadcastSignalAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.invocationactions.callbehavioraction" 
-				label="Call Behavior Action"
-				description="Create an Call Behavior Action node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.invocationactions.calloperationaction" 
-				label="Call Operation Action"
-				description="Create a Call Operation Action node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.invocationactions.sendobjectaction" 
-				label="Send Object Action"
-				description="Create a Send Object Action node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SendObjectAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.invocationactions.sendsignalaction" 
-				label="Send Signal Action"
-				description="Create a Send Signal Action node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendSignalAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SendSignalAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.invocationactions.startobjectbehaviouraction" 
-				label="Start Object Behaviour Action "
-				description="Create a Start Object Behaviour Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StartObjectBehaviorAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.objectactions" label="ObjectActions">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.objectactions.createobjectaction" 
-				label="Create Object Action"
-				description="Create a Create Object Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateObjectAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CreateObjectAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.objectactions.destroyobjectaction" 
-				label="Destroy Object Action"
-				description="Create a Destroy Object Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyObjectAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DestroyObjectAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.objectactions.readselfaction" 
-				label="ReadSelfAction"
-				description="Create a ReadSelfAction">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadSelfAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadSelfAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.objectactions.reclassifyobjectaction" 
-				label="Reclassify Object Action"
-				description="Create a ReclassifyObjectAction">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReclassifyObjectAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.objectactions.readisclassifiedobjectaction" 
-				label="Read Is Classified Object Action"
-				description="Create a Read Is Classified Object Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadIsClassifiedObjectAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.structuredactions" label="StructuredActions">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.structuredactions.structuredactivitynode" 
-				label="Structured Activity Node"
-				description="Create a Structured Activity Node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StructuredActivityNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.structuredactions.loopnode" 
-				label="Loop Node"
-				description="Create a Loop Node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.LoopNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.structuredactions.sequencenode" 
-				label="Sequence Node"
-				description="Create a Sequence Node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SequenceNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SequenceNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.structuredactions.conditionalnode" 
-				label="Conditional Node"
-				description="Create a Conditional Node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConditionalNode.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConditionalNode_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.structuralfeatureactions" label="StructuralFeatureActions">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.structuralfeatureactions.readstructuralfeatureaction" 
-				label="Read Structural Feature Action"
-				description="Create Read Structural Feature Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadStructuralFeatureAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.structuralfeatureactions.addstructuralfeaturevalueaction" 
-				label="Add Structural Feature Value Action"
-				description="Create Add Structural Feature Value Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AddStructuralFeatureValueAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.structuralfeatureactions.clearstructuralfeature" 
-				label="Clear Structural Feature"
-				description="Create a Clear Structural Feature Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ClearStructuralFeatureAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.variableactions" label="VariableActions">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.variableactions.addvariablevalueaction" 
-				label="Add Variable Value Action"
-				description="Create Add Variable Value Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddVariableValueAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AddVariableValueAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.variableactions.readvariableaction" 
-				label="Read Variable Action"
-				description="Create a Read Variable Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadVariableAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadVariableAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.miscellaneousactions" label="MiscellaneousActions">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.miscellaneousactions.opaqueaction" 
-				label="Opaque Action"
-				description="Create an Opaque Action node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.miscellaneousactions.valuespecificationaction" 
-				label="Value Specification Action"
-				description="Create a Value Specification Action node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValueSpecificationAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValueSpecificationAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.miscellaneousactions.clearassociationaction" 
-				label="Clear Association Action"
-				description="Create a Clear Association Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearAssociationAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ClearAssociationAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.miscellaneousactions.readextentaction" 
-				label="Read Extent Action"
-				description="Create a Read Extent Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadExtentAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadExtentAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.miscellaneousactions.reduceaction" 
-				label="Reduce Action"
-				description="Create a Reduce Action node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReduceAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReduceAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.miscellaneousactions.startclassifierbehavior" 
-				label="Start Classifier Behavior"
-				description="Create a Start Classifier Behavior">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StartClassifierBehaviorAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.linkactions" label="LinkActions">
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.linkactions.createlinkaction" 
-				label="Create Link Action"
-				description="Create a Create Link Action node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CreateLinkAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.linkactions.readlinkaction" 
-				label="Read Link Action"
-				description="Create a Read Link Action node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadLinkAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadLinkAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.linkactions.destroylinkaction" 
-				label="Destroy Link Action"
-				description="Create a Destroy Link Action node">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyLinkAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DestroyLinkAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-			<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-				id="activity.nodes.linkactions.createlinkobjectaction" 
-				label="Create Link Object Action"
-				description="Create a Create Link Object Action">
-				<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif"/>
-				<elementDescriptors>
-					<elementType
-						xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-						href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CreateLinkObjectAction_Shape"/>
-				</elementDescriptors>
-			</ownedConfigurations>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.nodes.accepteventaction" 
-			label="Accept Event Action"
-			description="Create an Accept Event Action node">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AcceptEventAction_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.nodes.unmarshallaction" 
-			label="Unmarshall Action"
-			description="Create an Unmarshall Action node">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UnmarshallAction.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UnmarshallAction_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.nodes.testidentityaction" 
-			label="Test Identity Action "
-			description="Create a Test Identity Action node">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TestIdentityAction.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TestIdentityAction_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.nodes.activity" 
-			label="Activity"
-			description="Create an Activity">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.nodes.activityparameternode" 
-			label="Activity Parameter Node"
-			description="Create an Activity Parameter Node">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityParameterNode_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.nodes.centralbuffernode" 
-			label="Central Buffer Node"
-			description="Create a Central Buffer Node">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CentralBufferNode_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.nodes.datastorenode" 
-			label="Data Store Node"
-			description="Create a Data Store Node">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataStoreNode_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.nodes.constraint" 
-			label="Constraint"
-			description="Create a Constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.nodes.comment" 
-			label="Comment"
-			description="Create a Comment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
-	<drawerConfigurations
-		id="activity.edges"
-		label="Edges"
-		description="">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.edges.controlflow" 
-			label="Control Flow"
-			description="Create a Control Flow" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ControlFlow_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.edges.exceptionhandler" 
-			label="Exception Handler"
-			description="Create an Exception Handler" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExceptionHandler.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExceptionHandler_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.edges.objectflow" 
-			label="Object Flow"
-			description="Create an Object Flow" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ObjectFlow_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="activity.edges.link" 
-			label="Link"
-			description="Create of a link for comment" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.activity" iconPath="icons/obj16/Link.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.activity.paletteconfiguration" label="Papyrus activity editor Plugin Palette" description="This is the palette of Papyrus activity editor Plugin">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="activity.nodes" label="Nodes" description="">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.activitygroup" label="ActivityGroup">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.activitygroup.activitypartition" label="Activity Partition" description="Create an Activity Partition" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityPartition_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.activitygroup.interruptibleactivityregion" label="Interruptible Activity Region" description="Create an Interruptible Activity Region" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.controlnodes" label="ControlNodes">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.controlnodes.initialnode" label="Initial node" description="Create an Initial node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InitialNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.controlnodes.activityfinal" label="Activity final" description="Create an Activity final node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityFinalNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityFinalNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.controlnodes.flowfinal" label="Flow final" description="Create a Flow final node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FlowFinalNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.controlnodes.decisionnode" label="Decision node" description="Create a Decision node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DecisionNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.controlnodes.mergenode" label="Merge node" description="Create a Merge node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.MergeNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.controlnodes.joinnode" label="Join node" description="Create a Merge node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.JoinNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.controlnodes.forknode" label="Fork node" description="Create a Fork node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ForkNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.constraints" label="Constraints">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.constraints.localpreconditionconstraint" label="Local Precondition Constraint" description="Create a Constraint as Local Precondition for an Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_LocalPreconditionShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.constraints.localpreconditionintervalconstraint" label="Local Precondition Interval Constraint" description="Create an Interval Constraint as Local Precondition for an Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.IntervalConstraint_LocalPreconditionShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.constraints.localpreconditiondurationconstraint" label="Local Precondition Duration Constraint" description="Create a Duration Constraint as Local Precondition for an Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationConstraint_LocalPreconditionShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.constraints.localpreconditiontimeconstraint" label="Local Precondition Time Constraint" description="Create a Time Constraint as Local Precondition for an Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeConstraint_LocalPreconditionShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.constraints.localpostconditionconstraint" label="Local Postcondition Constraint" description="Create a Constraint as Local Postcondition for an Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_LocalPostconditionShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.constraints.localpostconditionintervalconstraint" label="Local Postcondition Interval Constraint" description="Create an Interval Constraint as Local Postcondition for an Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/IntervalConstraint.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.IntervalConstraint_LocalPostconditionShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.constraints.localpostconditiondurationconstraint" label="Local Postcondition Duration Constraint" description="Create a Duration Constraint as Local Postcondition for an Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationConstraint_LocalPostconditionShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.constraints.localpostconditiontimeconstraint" label="Local Postcondition Time Constraint" description="Create a Time Constraint as Local Postcondition for an Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeConstraint_LocalPostconditionShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.pins" label="Pins">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.pins.outputpin" label="Output Pin" description="Create an Output Pin" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_ReduceActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_LoopNodeVariableShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_LoopNodeResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_StructuredActivityNodeOutputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionResultShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OutputPin_UnmarshallActionResultShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.pins.inputpin" label="Input Pin" description="Create an Input Pin" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_TestIdentityActionFirstShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_TestIdentityActionSecondShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CreateLinkActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReadLinkActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_DestroyLinkActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReduceActionCollectionShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInsertAtShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionValueShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionInsertAtShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StructuredActivityNodeInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_CreateLinkObjectActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_UnmarshallActionObjectShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.pins.actioninputpin" label="Action Input Pin" description="Create an Action Input Pin" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionInputPin.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_OpaqueActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionFirstShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionSecondShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ClearStructuralFeatureActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_DestroyLinkActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ClearAssociationActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ReclassifyObjectActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ReadIsClassifiedObjectActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ReduceActionCollectionShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_StartClassifierBehaviorActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_DestroyObjectActionTargetShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionInsertAtShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionValueShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_BroadcastSignalActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionValueShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionInsertAtShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_LoopNodeVariableInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_StructuredActivityNodeInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkObjectActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_ReadStructuralFeatureActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionInputPin_UnmarshallActionObjectShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.pins.valuepin" label="Value Pin" description="Create a Value Pin" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValuePin.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_OpaqueActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_CallOperationActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_SendSignalActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionFirstShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionSecondShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ClearStructuralFeatureActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_CreateLinkActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ReadLinkActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_DestroyLinkActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ClearAssociationActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ReclassifyObjectActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ReadIsClassifiedObjectActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ReduceActionCollectionShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_StartClassifierBehaviorActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_DestroyObjectActionTargetShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionInsertAtShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionValueShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_BroadcastSignalActionArgumentShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionValueShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionInsertAtShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_LoopNodeVariableInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_StructuredActivityNodeInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_CreateLinkObjectActionInputShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_ReadStructuralFeatureActionObjectShape"/>
+        </elementDescriptors>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValuePin_UnmarshallActionObjectShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.expansionregions" label="ExpansionRegions">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.expansionregions.expansionregion" label="Expansion Region" description="Create an Expansion Region" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExpansionRegion_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.expansionregions.inputexpansionnode" label="Input Expansion Node" description="Create an Expansion Node as Input of an Expansion Region" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExpansionNode_InputShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.expansionregions.outputexpansionnode" label="Output Expansion Node" description="Create an Expansion Node as Output of an Expansion Region" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExpansionNode_OutputShape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.invocationactions" label="InvocationActions">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.invocationactions.broadcastsignalaction" label="Broadcast Signal Action" description="Create a Broadcast Signal Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BroadcastSignalAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.BroadcastSignalAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.invocationactions.callbehavioraction" label="Call Behavior Action" description="Create an Call Behavior Action node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.invocationactions.calloperationaction" label="Call Operation Action" description="Create a Call Operation Action node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.invocationactions.sendobjectaction" label="Send Object Action" description="Create a Send Object Action node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SendObjectAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.invocationactions.sendsignalaction" label="Send Signal Action" description="Create a Send Signal Action node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendSignalAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SendSignalAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.invocationactions.startobjectbehaviouraction" label="Start Object Behaviour Action " description="Create a Start Object Behaviour Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StartObjectBehaviorAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.objectactions" label="ObjectActions">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.objectactions.createobjectaction" label="Create Object Action" description="Create a Create Object Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateObjectAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CreateObjectAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.objectactions.destroyobjectaction" label="Destroy Object Action" description="Create a Destroy Object Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyObjectAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DestroyObjectAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.objectactions.readselfaction" label="ReadSelfAction" description="Create a ReadSelfAction" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadSelfAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadSelfAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.objectactions.reclassifyobjectaction" label="Reclassify Object Action" description="Create a ReclassifyObjectAction" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReclassifyObjectAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.objectactions.readisclassifiedobjectaction" label="Read Is Classified Object Action" description="Create a Read Is Classified Object Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadIsClassifiedObjectAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.structuredactions" label="StructuredActions">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.structuredactions.structuredactivitynode" label="Structured Activity Node" description="Create a Structured Activity Node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StructuredActivityNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.structuredactions.loopnode" label="Loop Node" description="Create a Loop Node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.LoopNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.structuredactions.sequencenode" label="Sequence Node" description="Create a Sequence Node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SequenceNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SequenceNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.structuredactions.conditionalnode" label="Conditional Node" description="Create a Conditional Node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConditionalNode.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConditionalNode_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.structuralfeatureactions" label="StructuralFeatureActions">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.structuralfeatureactions.readstructuralfeatureaction" label="Read Structural Feature Action" description="Create Read Structural Feature Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadStructuralFeatureAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.structuralfeatureactions.addstructuralfeaturevalueaction" label="Add Structural Feature Value Action" description="Create Add Structural Feature Value Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AddStructuralFeatureValueAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.structuralfeatureactions.clearstructuralfeature" label="Clear Structural Feature" description="Create a Clear Structural Feature Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ClearStructuralFeatureAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.variableactions" label="VariableActions">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.variableactions.addvariablevalueaction" label="Add Variable Value Action" description="Create Add Variable Value Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AddVariableValueAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AddVariableValueAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.variableactions.readvariableaction" label="Read Variable Action" description="Create a Read Variable Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadVariableAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadVariableAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.miscellaneousactions" label="MiscellaneousActions">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.miscellaneousactions.opaqueaction" label="Opaque Action" description="Create an Opaque Action node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.miscellaneousactions.valuespecificationaction" label="Value Specification Action" description="Create a Value Specification Action node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ValueSpecificationAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValueSpecificationAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.miscellaneousactions.clearassociationaction" label="Clear Association Action" description="Create a Clear Association Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClearAssociationAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ClearAssociationAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.miscellaneousactions.readextentaction" label="Read Extent Action" description="Create a Read Extent Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadExtentAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadExtentAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.miscellaneousactions.reduceaction" label="Reduce Action" description="Create a Reduce Action node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReduceAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReduceAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.miscellaneousactions.startclassifierbehavior" label="Start Classifier Behavior" description="Create a Start Classifier Behavior" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StartClassifierBehaviorAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="activity.nodes.linkactions" label="LinkActions">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.linkactions.createlinkaction" label="Create Link Action" description="Create a Create Link Action node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CreateLinkAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.linkactions.readlinkaction" label="Read Link Action" description="Create a Read Link Action node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ReadLinkAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadLinkAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.linkactions.destroylinkaction" label="Destroy Link Action" description="Create a Destroy Link Action node" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DestroyLinkAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DestroyLinkAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.linkactions.createlinkobjectaction" label="Create Link Object Action" description="Create a Create Link Object Action" kind="CreationTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CreateLinkObjectAction_Shape"/>
+        </elementDescriptors>
+      </ownedConfigurations>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.accepteventaction" label="Accept Event Action" description="Create an Accept Event Action node" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AcceptEventAction_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.unmarshallaction" label="Unmarshall Action" description="Create an Unmarshall Action node" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UnmarshallAction.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UnmarshallAction_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.testidentityaction" label="Test Identity Action " description="Create a Test Identity Action node" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TestIdentityAction.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TestIdentityAction_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.activity" label="Activity" description="Create an Activity" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.activityparameternode" label="Activity Parameter Node" description="Create an Activity Parameter Node" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityParameterNode_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.centralbuffernode" label="Central Buffer Node" description="Create a Central Buffer Node" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CentralBufferNode_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.datastorenode" label="Data Store Node" description="Create a Data Store Node" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataStoreNode_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.constraint" label="Constraint" description="Create a Constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.nodes.comment" label="Comment" description="Create a Comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="activity.edges" label="Edges" description="">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.edges.controlflow" label="Control Flow" description="Create a Control Flow" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ControlFlow_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.edges.exceptionhandler" label="Exception Handler" description="Create an Exception Handler" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExceptionHandler.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExceptionHandler_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.edges.objectflow" label="Object Flow" description="Create an Object Flow" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ObjectFlow_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="activity.edges.link" label="Link" description="Create of a link for comment" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.activity" iconPath="icons/obj16/Link.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
index 75c4f18e3a4..8d9c2e1ff22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/model/activityDiagram.elementtypesconfigurations
@@ -1,93 +1,93 @@
-<?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="_x8G0YGaNEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.activity.elementTypeSet" name="PapyrusUMLActivityDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_Shape"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_x8G0YGaNEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.activity.elementTypeSet" name="PapyrusUMLActivityDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallBehaviorActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_9UmhMGaOEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_9UmhMGaOEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallOperationActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Eu2FMGaPEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SendSignalAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Eu2FMGaPEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SendSignalActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SendSignalAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_ZqJusJt8EeatALl2pL8MPg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.AcceptEventActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.AcceptEventActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AcceptEventAction"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_ZqJusJt8EeatALl2pL8MPg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.AcceptEventActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.AcceptEventActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AcceptEventAction"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_D3E24LeqEea6mLGMOdxUcw" description="Update pin of a ReadStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadStructuralFeatureActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadStructuralFeatureActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadStructuralFeatureAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_D3E24LeqEea6mLGMOdxUcw" description="Update pin of a ReadStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadStructuralFeatureActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadStructuralFeatureActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadStructuralFeatureAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_PMdzALh0EeaTuqn7bG89MA" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.AddStructuralFeatureValueActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.AddStructuralFeatureValueActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AddStructuralFeatureValueAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_PMdzALh0EeaTuqn7bG89MA" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.AddStructuralFeatureValueActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.AddStructuralFeatureValueActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AddStructuralFeatureValueAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_xOprsLr1Eea7s8P-mR1w7Q" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CreateObjectActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CreateObjectActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CreateObjectAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_xOprsLr1Eea7s8P-mR1w7Q" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CreateObjectActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CreateObjectActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CreateObjectAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_AJTfYLrxEea7s8P-mR1w7Q" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ValueSpecificationActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ValueSpecificationActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValueSpecificationAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_AJTfYLrxEea7s8P-mR1w7Q" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ValueSpecificationActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ValueSpecificationActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ValueSpecificationAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_530YUL4TEeagt53-DMAhUA" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.TestIdentityActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.TestIdentityActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TestIdentityAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_530YUL4TEeagt53-DMAhUA" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.TestIdentityActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.TestIdentityActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TestIdentityAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_k30_0MESEeaZOJTNSI3IoQ" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CreateLinkActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CreateLinkActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CreateLinkAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_k30_0MESEeaZOJTNSI3IoQ" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CreateLinkActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CreateLinkActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CreateLinkAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_UxSs8PKdEeap37Oc6bzk0A" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.DestroyLinkActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.DestroyLinkActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DestroyLinkAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_UxSs8PKdEeap37Oc6bzk0A" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.DestroyLinkActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.DestroyLinkActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DestroyLinkAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_VETnUMLAEea39fmRoX19Og" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadLinkActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadLinkActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadLinkAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_VETnUMLAEea39fmRoX19Og" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadLinkActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadLinkActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadLinkAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_UshUcNZ_Eea59qT0SE9HCw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartClassifierBehaviorActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartClassifierBehaviorActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StartClassifierBehaviorAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_UshUcNZ_Eea59qT0SE9HCw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartClassifierBehaviorActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartClassifierBehaviorActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StartClassifierBehaviorAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_8PlT8NcMEeaqY_uVBFnnsA" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartObjectBehaviorActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartObjectBehaviorActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StartObjectBehaviorAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_8PlT8NcMEeaqY_uVBFnnsA" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartObjectBehaviorActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.StartObjectBehaviorActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StartObjectBehaviorAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_8WPb4NfYEeaDuNpRnlDJcw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadSelfActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadSelfActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadSelfAction_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_8WPb4NfYEeaDuNpRnlDJcw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadSelfActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ReadSelfActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ReadSelfAction_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_qc9DEKzLEeaKg_9XdFC-Jg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.TriggerEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.TriggerEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Trigger"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_qc9DEKzLEeaKg_9XdFC-Jg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.TriggerEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.TriggerEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Trigger"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_3Kg-0KyfEeaLH65NXKluhw" description="" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEventEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEventEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.SignalEvent"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_3Kg-0KyfEeaLH65NXKluhw" description="" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEventEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEventEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.SignalEvent"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_VsWYYKy_EeaLH65NXKluhw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Signal"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_VsWYYKy_EeaLH65NXKluhw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.SignalEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Signal"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_h552MKzGEeaKg_9XdFC-Jg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallEventEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallEventEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallEvent"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_h552MKzGEeaKg_9XdFC-Jg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallEventEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.CallEventEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallEvent"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_-7K_QKzBEeaLH65NXKluhw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.OperationEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.OperationEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Operation"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_-7K_QKzBEeaLH65NXKluhw" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.OperationEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.OperationEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Operation"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_1ZLnMK1nEeaKg_9XdFC-Jg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.PropertyEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.PropertyEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_1ZLnMK1nEeaKg_9XdFC-Jg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.PropertyEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.PropertyEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_dpWU0K1nEeaKg_9XdFC-Jg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ParameterEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ParameterEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Parameter"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_dpWU0K1nEeaKg_9XdFC-Jg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ParameterEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ParameterEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Parameter"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_mNzRULuNEeasR4RMLXDgew" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceSpecificationEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceSpecificationEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InstanceSpecification_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_mNzRULuNEeasR4RMLXDgew" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceSpecificationEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceSpecificationEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InstanceSpecification_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_WgtJgLuREeasR4RMLXDgew" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceValueEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceValueEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InstanceValue_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_WgtJgLuREeasR4RMLXDgew" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceValueEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InstanceValueEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InstanceValue_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_fvbIkMCDEeaCuaSn0ATaBA" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndCreationDataEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndCreationDataEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LinkEndCreationData"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_fvbIkMCDEeaCuaSn0ATaBA" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndCreationDataEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndCreationDataEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LinkEndCreationData"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_afWb8PKdEeap37Oc6bzk0A" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndDestructionDataEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndDestructionDataEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LinkEndDestructionData"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_afWb8PKdEeap37Oc6bzk0A" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndDestructionDataEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndDestructionDataEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LinkEndDestructionData"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_1etCINKPEeaUFd4nrxmIBg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndDataEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndDataEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LinkEndData"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_1etCINKPEeaUFd4nrxmIBg" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndDataEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.LinkEndDataEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LinkEndData"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_xLA5oNcUEeaqY_uVBFnnsA" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InputPinStartObjectBehaviorActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InputPinStartObjectBehaviorActionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_xLA5oNcUEeaqY_uVBFnnsA" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InputPinStartObjectBehaviorActionEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.InputPinStartObjectBehaviorActionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_oJutwOI1EeaaNdBqN0EQ0A" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.BehaviorEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.BehaviorEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_oJutwOI1EeaaNdBqN0EQ0A" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.BehaviorEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.BehaviorEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_qpSuUDYlEeeGB7-cMZyxlQ" description="Create pin between an ObjectFlow and an action (if it is authorized)" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ObjectFlowEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ObjectFlowEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ObjectFlow"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_qpSuUDYlEeeGB7-cMZyxlQ" description="Create pin between an ObjectFlow and an action (if it is authorized)" identifier="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ObjectFlowEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.activity.edit.advices.ObjectFlowEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ObjectFlow"/>
   </adviceBindingsConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index e8298315da7..4ee2f053628 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
@@ -76,10 +76,10 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili
  org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.100.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration
index c2ee1a38b84..8046824b132 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.paletteconfiguration
@@ -1,448 +1,448 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration 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:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.clazz.paletteconfiguration" label="PapyrusUMLClassDiagram Palette" description="This is the palette of PapyrusUMLClassDiagram">
-  <drawerConfigurations id="clazz.group.nodes" label="Nodes" description="Nodes">
-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.class" label="Class" description="Create a new Class">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_ComponentNestedClassifierLabel"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.clazz.paletteconfiguration" label="PapyrusUMLClassDiagram Palette" description="This is the palette of PapyrusUMLClassDiagram">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="clazz.group.nodes" label="Nodes" description="Nodes">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.class" label="Class" description="Create a new Class" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_ComponentNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_InterfaceNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_InterfaceNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_ClassNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_ClassNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.classifiertemplateparameter" label="Classifier Template Parameter" description="Create a Classifier Template Parameter">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ClassifierTemplateParameter_TemplateParameterLabel"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.classifiertemplateparameter" label="Classifier Template Parameter" description="Create a Classifier Template Parameter" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ClassifierTemplateParameter_TemplateParameterLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.comment" label="Comment" description="Create a comment">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.comment" label="Comment" description="Create a comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.component" label="Component" description="Create a component">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.component" label="Component" description="Create a component" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_Shape"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_Shape_CN"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_Shape_CN"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.constraint" label="Constraint" description="Create a constraint">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.constraint" label="Constraint" description="Create a constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_PackagedElementShape"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_PackagedElementShape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.datatype" label="Data Type" description="Create a new Data Type">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_Shape_CN"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.datatype" label="Data Type" description="Create a new Data Type" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_Shape_CN"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_Shape"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_Shape"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_ClassNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_ClassNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_ComponentNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_ComponentNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_InterfaceNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_InterfaceNestedClassifierLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="createDurationObservation7CreationTool" label="Duration Observation" description="Create new Duration Observation">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createDurationObservation7CreationTool" label="Duration Observation" description="Create new Duration Observation" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.enumeration" label="Enumeration" description="Create an enumeration">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_Shape_CN"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.enumeration" label="Enumeration" description="Create an enumeration" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_Shape_CN"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_Shape"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_Shape"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_ClassNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_ClassNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_ComponentNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_ComponentNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_InterfaceNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_InterfaceNestedClassifierLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.enumerationliteral" label="Enumeration Literal" description="Create an Enumeration Literal">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.enumerationliteral" label="Enumeration Literal" description="Create an Enumeration Literal" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.interface" label="Interface" description="Create an interface">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.interface" label="Interface" description="Create an interface" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_Shape"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_Shape_CN"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_Shape_CN"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_ClassNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_ClassNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_ComponentNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_ComponentNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_InterfaceNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_InterfaceNestedClassifierLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.instancespecification" label="Instance Specification" description="Create an Instance Specification">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InstanceSpecification_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.instancespecification" label="Instance Specification" description="Create an Instance Specification" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InstanceSpecification_Shape"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InstanceSpecification_Shape_CN"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InstanceSpecification_Shape_CN"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.informationitem" label="Information Item" description="Create an Information Item">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.informationitem" label="Information Item" description="Create an Information Item" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_Shape"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_Shape_CN"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_Shape_CN"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.primitivetype" label="Primitive Type" description="Create a Primitive Type">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.primitivetype" label="Primitive Type" description="Create a Primitive Type" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_Shape"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_Shape"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_ClassNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_ClassNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_ComponentNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_ComponentNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_InterfaceNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_InterfaceNestedClassifierLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.model" label="Model" description="Create a model">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.model" label="Model" description="Create a model" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape_CN"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape_CN"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.operation" label="Operation" description="Create an operation">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.operation" label="Operation" description="Create an operation" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_ClassOperationLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_ClassOperationLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.OperationTemplateParameter" label="Operation Template Parameter" description="Create an Operation Template Parameter">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OperationTemplateParameter.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OperationTemplateParameter_TemplateParameterLabel"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.OperationTemplateParameter" label="Operation Template Parameter" description="Create an Operation Template Parameter" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OperationTemplateParameter.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OperationTemplateParameter_TemplateParameterLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.package" label="Package" description="Create new Package">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.package" label="Package" description="Create new Package" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.property" label="Property" description="Create a new Property">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_ComponentAttributeLabel"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.property" label="Property" description="Create a new Property" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_ComponentAttributeLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_SignalAttributeLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_SignalAttributeLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_ClassAttributeLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_ClassAttributeLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_PrimitiveTypeAttributeLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_PrimitiveTypeAttributeLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.reception" label="Reception" description="Create a reception">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Reception_ReceptionLabel"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.reception" label="Reception" description="Create a reception" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Reception_ReceptionLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.redefinabletemplatesignature" label="Redefinable Template Signature" description="Create a Redefinable Template Signature">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.redefinabletemplatesignature" label="Redefinable Template Signature" description="Create a Redefinable Template Signature" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.signal" label="Signal" description="Create a signal">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.signal" label="Signal" description="Create a signal" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_Shape"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_Shape_CN"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_Shape_CN"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_ClassNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_ClassNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_ComponentNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_ComponentNestedClassifierLabel"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_InterfaceNestedClassifierLabel"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_InterfaceNestedClassifierLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.slot" label="Slot" description="Create a Slot">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Slot_SlotLabel"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.slot" label="Slot" description="Create a Slot" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Slot_SlotLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.templateparameter" label="Template Parameter" description="Create a Template Parameter">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateParameter.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TemplateParameter_TemplateParameterLabel"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.templateparameter" label="Template Parameter" description="Create a Template Parameter" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateParameter.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TemplateParameter_TemplateParameterLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.templatesignature" label="Template Signature" description="Create a Template Signature">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateSignature.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TemplateSignature_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.templatesignature" label="Template Signature" description="Create a Template Signature" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateSignature.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TemplateSignature_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="createTimeObservation22CreationTool" label="Time Observation" description="Create new Time Observation">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createTimeObservation22CreationTool" label="Time Observation" description="Create new Time Observation" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.connectableelementtemplateparameter" label="Connectable Element Template Parameter" description="Create a Connectable Element Template Parameter">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConnectableElementTemplateParameter_TemplateParameterLabel"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.connectableelementtemplateparameter" label="Connectable Element Template Parameter" description="Create a Connectable Element Template Parameter" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConnectableElementTemplateParameter_TemplateParameterLabel"/>
       </elementDescriptors>
     </ownedConfigurations>
   </drawerConfigurations>
-  <drawerConfigurations id="clazz.group.relationships" label="Edges" description="Edges">
-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.abstraction" label="Abstraction" description="Create an Abstraction" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Abstraction_Edge"/>
-      </elementDescriptors>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:StackConfiguration" id="clazz.group.relationships.associations" label="Associations">
-      <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.associationdirected" label="Association (Directed)" description="Create a Directed Association" kind="ConnectionTool">
-        <icon pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_none_directed.gif"/>
-        <elementDescriptors>
-          <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationDirected_Edge"/>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="clazz.group.relationships" label="Edges" description="Edges">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.abstraction" label="Abstraction" description="Create an Abstraction" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Abstraction_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:StackConfiguration" id="clazz.group.relationships.associations" label="Associations">
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.associationdirected" label="Association (Directed)" description="Create a Directed Association" kind="ConnectionTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_none_directed.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationDirected_Edge"/>
         </elementDescriptors>
       </ownedConfigurations>
-      <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.association" label="Association" description="Create an Association" kind="ConnectionTool">
-        <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
-        <elementDescriptors>
-          <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationNonDirected_Edge"/>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.association" label="Association" description="Create an Association" kind="ConnectionTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationNonDirected_Edge"/>
         </elementDescriptors>
       </ownedConfigurations>
-      <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.associationcompositedirected" label="Composite Association (Directed)" description="Create a Directed composite Association" kind="ConnectionTool">
-        <icon pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_composite_directed.gif"/>
-        <elementDescriptors>
-          <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationCompositeDirected_Edge"/>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.associationcompositedirected" label="Composite Association (Directed)" description="Create a Directed composite Association" kind="ConnectionTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_composite_directed.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationCompositeDirected_Edge"/>
         </elementDescriptors>
       </ownedConfigurations>
-      <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.associationshareddirected" label="Shared Association (Directed)" description="Create a Directed Shared Association" kind="ConnectionTool">
-        <icon pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_shared_directed.gif"/>
-        <elementDescriptors>
-          <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationSharedDirected_Edge"/>
+      <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.associationshareddirected" label="Shared Association (Directed)" description="Create a Directed Shared Association" kind="ConnectionTool">
+        <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_shared_directed.gif"/>
+        <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+          <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationSharedDirected_Edge"/>
         </elementDescriptors>
       </ownedConfigurations>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.associationbranch" label="Association Branch" description="Create an Association Branch" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_BranchEdge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.associationbranch" label="Association Branch" description="Create an Association Branch" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_BranchEdge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.associationclass" label="Association Class" description="create an Association Class" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AssociationClass.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationClass_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.associationclass" label="Association Class" description="create an Association Class" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AssociationClass.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationClass_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.containmentlink" label="Containment Link" description="Create a Containment Link" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="icons/obj16/ContainmentConnection.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Element_ContainmentEdge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.containmentlink" label="Containment Link" description="Create a Containment Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="icons/obj16/ContainmentConnection.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Element_ContainmentEdge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.contextlink" label="Context Link" description="Creation of a context link for a Constraint" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ContextEdge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.contextlink" label="Context Link" description="Creation of a context link for a Constraint" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ContextEdge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.dependency" label="Dependency" description="Create a dependency" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.dependency" label="Dependency" description="Create a dependency" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.dependencybranch" label="Dependency Branch" description="Create a Dependency Branch" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_BranchEdge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.dependencybranch" label="Dependency Branch" description="Create a Dependency Branch" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_BranchEdge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.elementimport" label="Element Import" description="Create a Element Import" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ElementImport_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.elementimport" label="Element Import" description="Create a Element Import" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ElementImport.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ElementImport_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.generalization" label="Generalization" description=" Create a Generalization" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.generalization" label="Generalization" description=" Create a Generalization" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.generalizationset" label="Generalization Set" description="Generalization Set" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/GeneralizationSet.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.GeneralizationSet_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.generalizationset" label="Generalization Set" description="Generalization Set" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/GeneralizationSet.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.GeneralizationSet_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.informationflowlink" label="Information Flow" description="Create an Information Flow" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationFlow_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.informationflowlink" label="Information Flow" description="Create an Information Flow" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationFlow_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.instancespecificationlink" label="Instance Specification" description="Create an Instance Specification" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="icons/obj16/InstanceLink.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InstanceSpecification_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.instancespecificationlink" label="Instance Specification" description="Create an Instance Specification" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="icons/obj16/InstanceLink.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InstanceSpecification_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.interfacerealization" label="Interface Realization" description="Create an Interface Realization" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InterfaceRealization_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.interfacerealization" label="Interface Realization" description="Create an Interface Realization" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InterfaceRealization_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.link" label="Link" description="Creation of a link for comment, constraint, TimeObservation, DurationObservation" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="icons/obj16/Link.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.link" label="Link" description="Creation of a link for comment, constraint, TimeObservation, DurationObservation" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="icons/obj16/Link.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_EventEdge"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_EventEdge"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_EventEdge"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_EventEdge"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.packageimport" label="Package Import" description=" Create a Package Import" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PackageImport_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.packageimport" label="Package Import" description=" Create a Package Import" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PackageImport_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.packagemerge" label="Package Merge" description="Create a Package Merge" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PackageMerge_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.packagemerge" label="Package Merge" description="Create a Package Merge" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PackageMerge_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.profileapplication" label="Profile Application" description="Create a Profile Application" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProfileApplication_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.profileapplication" label="Profile Application" description="Create a Profile Application" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProfileApplication_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.realization" label="Realization" description="Create a Realization" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Realization_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.realization" label="Realization" description="Create a Realization" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Realization_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.substitution" label="Substitution" description="Create a substitution" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Substitution_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.substitution" label="Substitution" description="Create a substitution" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Substitution_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.templatebinding" label="Template Binding" description="Create a Template Binding" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateBinding.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TemplateBinding_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.templatebinding" label="Template Binding" description="Create a Template Binding" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TemplateBinding.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TemplateBinding_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.usage" label="Usage" description="Create an Usage" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Usage_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="clazz.tool.usage" label="Usage" description="Create an Usage" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Usage_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
   </drawerConfigurations>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
index 715f6ac939d..73b2540bf0d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.elementtypesconfigurations
@@ -1,15 +1,15 @@
-<?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="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.uml.diagram.clazz.elementTypeSet" name="PapyrusUMLClassDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ" description="Enumeration specific advices (remove inconsistent views when an Enumeration or a child is moved)" identifier="org.eclipse.papyrus.uml.diagram.clazz.EnumerationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.EnumerationHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Enumeration"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.uml.diagram.clazz.elementTypeSet" name="PapyrusUMLClassDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_fdf5EGBZEeWbqYFeFvN0SQ" description="Enumeration specific advices (remove inconsistent views when an Enumeration or a child is moved)" identifier="org.eclipse.papyrus.uml.diagram.clazz.EnumerationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.EnumerationHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Enumeration"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_VPE3UJpvEeWZOI1l_xp4vg" description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted)" identifier="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.GeneralizationHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Generalization"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_VPE3UJpvEeWZOI1l_xp4vg" description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted)" identifier="org.eclipse.papyrus.uml.diagram.clazz.GeneralizationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.GeneralizationHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Generalization"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_46cVMPszEeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.class.NamespaceHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.NamespaceHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Namespace"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_46cVMPszEeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.class.NamespaceHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.NamespaceHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Namespace"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_P80rsPs0EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.class.ConstraintHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.ConstraintHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_P80rsPs0EeWBLbCxWzTFGw" identifier="org.eclipse.papyrus.uml.diagram.class.ConstraintHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice.ConstraintHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
   </adviceBindingsConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml
index ef3dc720193..35a203a0b92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/pom.xml
@@ -8,6 +8,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.clazz</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index 9c70f07030b..345721d20e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
@@ -70,12 +70,12 @@ Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.0
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.services.localizer;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
  org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.nebula.widgets.richtext;bundle-version="[1.0.0,2.0.0)",
@@ -86,11 +86,13 @@ Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.0
  org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.2.0.qualifier
 Eclipse-BuddyPolicy: dependent
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml
index d6c1abcad3b..02e705d20ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/pom.xml
@@ -7,6 +7,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.common</artifactId>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.2.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java
index 86d2b7da877..ada965339ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/part/UmlGmfDiagramEditor.java
@@ -73,6 +73,7 @@ public class UmlGmfDiagramEditor extends SynchronizableGmfDiagramEditor implemen
 
 	/**
 	 * Listener to to the diagram kind
+	 * @since 3.1
 	 */
 	protected Adapter diagramKindAdapter;
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
index d2b4d905d5d..f25dd3eafd0 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF
@@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-v
  org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.draw2d;visibility:=reexport;bundle-version="[3.10.0,4.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/PapyrusUMLCommunicationDiagram.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/PapyrusUMLCommunicationDiagram.paletteconfiguration
index d49de072887..b196a1ac9d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/PapyrusUMLCommunicationDiagram.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/PapyrusUMLCommunicationDiagram.paletteconfiguration
@@ -1,113 +1,60 @@
-<?xml version="1.0" encoding="ASCII"?>
-<?gmfgen generated="true"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8"
-	xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
-	id="org.eclipse.papyrus.uml.diagram.communication.paletteconfiguration"
-	label="org.eclipse.papyrus.uml.diagram.communication Palette"
-	description="This is the palette of org.eclipse.papyrus.uml.diagram.communication">
-	<drawerConfigurations
-		id="communication.group.nodes"
-		label="Nodes"
-		description="Nodes">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="communication.tool.lifeline" 
-			label="Lifeline"
-			description="Create a Lifeline">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Lifeline.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Lifeline_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="communication.tool.comment" 
-			label="Comment"
-			description="Create new Comment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="communication.tool.constraint" 
-			label="Constraint"
-			description="Create a constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="communication.tool.durationobservation" 
-			label="Duration Observation"
-			description="Create a Duration Observation on a Message">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="communication.tool.timeobservation" 
-			label="Time Observation"
-			description="Create a Time Observation">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
-	<drawerConfigurations
-		id="createEdges2Group"
-		label="Edges"
-		description="Edges tools">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createMessageCreateCreationTool" 
-			label="Message"
-			description="MessageCreate" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_createMessage.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.communication.Path_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createLink13CreationTool" 
-			label="Link"
-			description="Creation of a link for comment, constraint, TimeObservation, DurationObservation" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.communication" iconPath="icons/obj16/Link.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_EventEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_EventEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.communication.paletteconfiguration" label="org.eclipse.papyrus.uml.diagram.communication Palette" description="This is the palette of org.eclipse.papyrus.uml.diagram.communication">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="communication.group.nodes" label="Nodes" description="Nodes">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="communication.tool.lifeline" label="Lifeline" description="Create a Lifeline" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Lifeline.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Lifeline_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="communication.tool.comment" label="Comment" description="Create new Comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="communication.tool.constraint" label="Constraint" description="Create a constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="communication.tool.durationobservation" label="Duration Observation" description="Create a Duration Observation on a Message" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="communication.tool.timeobservation" label="Time Observation" description="Create a Time Observation" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="createEdges2Group" label="Edges" description="Edges tools">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createMessageCreateCreationTool" label="Message" description="MessageCreate" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_createMessage.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations#org.eclipse.papyrus.uml.communication.Path_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createLink13CreationTool" label="Link" description="Creation of a link for comment, constraint, TimeObservation, DurationObservation" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.communication" iconPath="icons/obj16/Link.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_EventEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_EventEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations
index d44ad03c6e9..1fb1bd719be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/model/communicationdiagram.elementtypesconfigurations
@@ -1,6 +1,6 @@
-<?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="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.uml.diagram.communication.elementTypeSet" name="PapyrusUMLCommunicationDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.communication.Path_Edge" identifier="org.eclipse.papyrus.uml.communication.Path_Edge" name="Path_Edge" hint="Path_Edge">
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_AsynchEdge"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_rWI4YHPzEeSnGJwaJWHCSg" description="" identifier="org.eclipse.papyrus.uml.diagram.communication.elementTypeSet" name="PapyrusUMLCommunicationDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.communication.Path_Edge" identifier="org.eclipse.papyrus.uml.communication.Path_Edge" name="Path_Edge" hint="Path_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_AsynchEdge"/>
   </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
index 1b99e2b9b61..e48c1609fde 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF
@@ -41,7 +41,7 @@ Require-Bundle: org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/PapyrusUMLComponentDiagram.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/PapyrusUMLComponentDiagram.paletteconfiguration
index d54e5174120..ad046d119fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/PapyrusUMLComponentDiagram.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/PapyrusUMLComponentDiagram.paletteconfiguration
@@ -1,297 +1,162 @@
-<?xml version="1.0" encoding="ASCII"?>
-<?gmfgen generated="true"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8"
-	xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
-	id="org.eclipse.papyrus.uml.diagram.component.paletteconfiguration"
-	label="Papyrus Component Diagram  Palette"
-	description="This is the palette of Papyrus Component Diagram ">
-	<drawerConfigurations
-		id="component.group.nodes"
-		label="Nodes"
-		description="Diagram Nodes">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.constraint" 
-			label="Constraint"
-			description="Create a Constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.comment" 
-			label="Comment"
-			description="Create a Comment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.component" 
-			label="Component"
-			description="Create a Component">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_PackagedElementShape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_PackagedElementShape_CCN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_PackagedElementShape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.interface" 
-			label="Interface"
-			description="Create an Interface">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_ClassifierShape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_ClassifierShape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.model" 
-			label="Model"
-			description="Create a model">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.property" 
-			label="Property"
-			description="Create a Property">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.operation" 
-			label="Operation"
-			description="Create an Operation">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.package" 
-			label="Package"
-			description="Create a Package">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.port" 
-			label="Port"
-			description="Create a Port">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.reception" 
-			label="Reception"
-			description="Create a Reception">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
-	<drawerConfigurations
-		id="component.group.links"
-		label="Links"
-		description="Diagram Links">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.link" 
-			label="Link"
-			description="Create a Link (Comment / Constraint)" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.component" iconPath="icons/obj16/Link.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.connector" 
-			label="Connector"
-			description="Create new Connector" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Connector_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.dependency" 
-			label="Dependency"
-			description="Create a Dependency" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.dependencybranch" 
-			label="DependencyBranch"
-			description="Create a dependency branch" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_BranchEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.abstraction" 
-			label="Abstraction"
-			description="Create an Abstraction" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Abstraction_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.manifestation" 
-			label="Manifestation"
-			description="Create a Manifestation" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Manifestation_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.generalization" 
-			label="Generalization"
-			description="Create a Generalization link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.usage" 
-			label="Usage"
-			description="Create an Usage" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Usage_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.substitution" 
-			label="Substitution"
-			description="Create a Substitution" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Substitution_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.interfaceRealization" 
-			label="Interface Realization"
-			description="Create an Interface Realization" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InterfaceRealization_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="component.tool.componentRealization" 
-			label="Component Realization"
-			description="Create a Component Realization" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ComponentRealization.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ComponentRealization_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.component.paletteconfiguration" label="Papyrus Component Diagram  Palette" description="This is the palette of Papyrus Component Diagram ">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="component.group.nodes" label="Nodes" description="Diagram Nodes">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.constraint" label="Constraint" description="Create a Constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.comment" label="Comment" description="Create a Comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.component" label="Component" description="Create a Component" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_PackagedElementShape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_PackagedElementShape_CCN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_PackagedElementShape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.interface" label="Interface" description="Create an Interface" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_ClassifierShape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_ClassifierShape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.model" label="Model" description="Create a model" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.property" label="Property" description="Create a Property" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.operation" label="Operation" description="Create an Operation" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.package" label="Package" description="Create a Package" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.port" label="Port" description="Create a Port" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.reception" label="Reception" description="Create a Reception" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="component.group.links" label="Links" description="Diagram Links">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.link" label="Link" description="Create a Link (Comment / Constraint)" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.component" iconPath="icons/obj16/Link.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.connector" label="Connector" description="Create new Connector" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Connector_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.dependency" label="Dependency" description="Create a Dependency" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.dependencybranch" label="DependencyBranch" description="Create a dependency branch" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_BranchEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.abstraction" label="Abstraction" description="Create an Abstraction" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Abstraction_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.manifestation" label="Manifestation" description="Create a Manifestation" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Manifestation_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.generalization" label="Generalization" description="Create a Generalization link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.usage" label="Usage" description="Create an Usage" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Usage_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.substitution" label="Substitution" description="Create a Substitution" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Substitution_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.interfaceRealization" label="Interface Realization" description="Create an Interface Realization" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InterfaceRealization_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="component.tool.componentRealization" label="Component Realization" description="Create a Component Realization" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ComponentRealization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ComponentRealization_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
index 52303eb4d60..5422bf4c1b0 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
@@ -37,7 +37,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version=
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/CompositeStructure.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/CompositeStructure.paletteconfiguration
index 9ba77dac268..b5a384b1b63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/CompositeStructure.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/CompositeStructure.paletteconfiguration
@@ -1,443 +1,243 @@
-<?xml version="1.0" encoding="ASCII"?>
-<?gmfgen generated="true"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8"
-	xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
-	id="org.eclipse.papyrus.uml.diagram.composite.paletteconfiguration"
-	label="Papyrus Composite Structure Diagram  Palette"
-	description="This is the palette of Papyrus Composite Structure Diagram ">
-	<drawerConfigurations
-		id="composite.group.nodes"
-		label="Nodes"
-		description="Nodes">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.class" 
-			label="Class"
-			description="Create new Class">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.property" 
-			label="Property"
-			description="Create new Property">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.port" 
-			label="Port"
-			description="Create new Port">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.collaboration" 
-			label="Collaboration"
-			description="Create new Collaboration">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Collaboration_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Collaboration_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.collaborationrole" 
-			label="CollaborationRole"
-			description="Create new CollaborationRole">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.composite" iconPath="icons/obj16/CollaborationRole.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConnectableElement_CollaborationRoleShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.collaborationuse" 
-			label="CollaborationUse"
-			description="Create new CollaborationUse">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CollaborationUse.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CollaborationUse_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.comment" 
-			label="Comment"
-			description="Create new Comment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.constraint" 
-			label="Constraint"
-			description="Create new Constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.timeobservation" 
-			label="TimeObservation"
-			description="Create new TimeObservation">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.durationobservation" 
-			label="DurationObservation"
-			description="Create new DurationObservation">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.informationitem" 
-			label="InformationItem"
-			description="Create new InformationItem">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.parameter" 
-			label="Parameter"
-			description="Create new Parameter">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Parameter_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.activity" 
-			label="Activity"
-			description="Create new Activity">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.interaction" 
-			label="Interaction"
-			description="Create new Interaction">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interaction.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interaction_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interaction_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.protocolstatemachine" 
-			label="ProtocolStateMachine"
-			description="Create new ProtocolStateMachine">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolStateMachine.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.statemachine" 
-			label="StateMachine"
-			description="Create new StateMachine">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateMachine_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateMachine_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.functionbehavior" 
-			label="FunctionBehavior"
-			description="Create new FunctionBehavior">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FunctionBehavior.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FunctionBehavior_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FunctionBehavior_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.opaquebehavior" 
-			label="OpaqueBehavior"
-			description="Create new OpaqueBehavior">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueBehavior_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueBehavior_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.stringExpression" 
-			label="StringExpression"
-			description="Create new StringExpression">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StringExpression.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StringExpression_PackagedElementShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
-	<drawerConfigurations
-		id="composite.group.edges"
-		label="Edges"
-		description="Edges">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.link" 
-			label="Link"
-			description="Create new Link (Comment / Constraint)" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.composite" iconPath="icons/obj16/Link.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_EventEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_EventEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.connector" 
-			label="Connector"
-			description="Create new Connector" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Connector_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.rolebinding" 
-			label="RoleBinding"
-			description="Create new RoleBinding" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.composite" iconPath="icons/obj16/CollaborationRoleBinding.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_RoleBindingEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.generalization" 
-			label="Generalization"
-			description="Create new Generalization" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.realization" 
-			label="Realization"
-			description="Create new Realization" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Realization_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.substitution" 
-			label="Substitution"
-			description="Create new Substitution" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Substitution_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.abstraction" 
-			label="Abstraction"
-			description="Create new Abstraction" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Abstraction_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.usage" 
-			label="Usage"
-			description="Create new Usage" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Usage_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.dependency" 
-			label="Dependency"
-			description="Create new Dependency" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.representation" 
-			label="Representation"
-			description="Create new representation for an InformationItem" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.composite" iconPath="icons/obj16/Representation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Representation_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.informationflow" 
-			label="InformationFlow"
-			description="Create new InformationFlow" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationFlow_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.manifestation" 
-			label="Manifestation"
-			description="Create new Manifestation" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Manifestation_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="composite.tool.deployment" 
-			label="Deployment"
-			description="Create new Deployment" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Deployment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Deployment_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.composite.paletteconfiguration" label="Papyrus Composite Structure Diagram  Palette" description="This is the palette of Papyrus Composite Structure Diagram ">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="composite.group.nodes" label="Nodes" description="Nodes">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.class" label="Class" description="Create new Class" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.property" label="Property" description="Create new Property" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.port" label="Port" description="Create new Port" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.collaboration" label="Collaboration" description="Create new Collaboration" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Collaboration.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Collaboration_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Collaboration_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.collaborationrole" label="CollaborationRole" description="Create new CollaborationRole" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.composite" iconPath="icons/obj16/CollaborationRole.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConnectableElement_CollaborationRoleShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.collaborationuse" label="CollaborationUse" description="Create new CollaborationUse" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CollaborationUse.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CollaborationUse_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.comment" label="Comment" description="Create new Comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.constraint" label="Constraint" description="Create new Constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.timeobservation" label="TimeObservation" description="Create new TimeObservation" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.durationobservation" label="DurationObservation" description="Create new DurationObservation" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.informationitem" label="InformationItem" description="Create new InformationItem" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationItem.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.parameter" label="Parameter" description="Create new Parameter" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Parameter_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.activity" label="Activity" description="Create new Activity" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.interaction" label="Interaction" description="Create new Interaction" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interaction.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interaction_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interaction_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.protocolstatemachine" label="ProtocolStateMachine" description="Create new ProtocolStateMachine" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProtocolStateMachine.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.statemachine" label="StateMachine" description="Create new StateMachine" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateMachine_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateMachine_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.functionbehavior" label="FunctionBehavior" description="Create new FunctionBehavior" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FunctionBehavior.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FunctionBehavior_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FunctionBehavior_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.opaquebehavior" label="OpaqueBehavior" description="Create new OpaqueBehavior" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueBehavior.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueBehavior_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueBehavior_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.stringExpression" label="StringExpression" description="Create new StringExpression" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StringExpression.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StringExpression_PackagedElementShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="composite.group.edges" label="Edges" description="Edges">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.link" label="Link" description="Create new Link (Comment / Constraint)" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.composite" iconPath="icons/obj16/Link.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_EventEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_EventEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.connector" label="Connector" description="Create new Connector" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Connector_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.rolebinding" label="RoleBinding" description="Create new RoleBinding" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.composite" iconPath="icons/obj16/CollaborationRoleBinding.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_RoleBindingEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.generalization" label="Generalization" description="Create new Generalization" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.realization" label="Realization" description="Create new Realization" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Realization_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.substitution" label="Substitution" description="Create new Substitution" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Substitution.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Substitution_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.abstraction" label="Abstraction" description="Create new Abstraction" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Abstraction_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.usage" label="Usage" description="Create new Usage" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Usage_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.dependency" label="Dependency" description="Create new Dependency" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.representation" label="Representation" description="Create new representation for an InformationItem" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.composite" iconPath="icons/obj16/Representation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Representation_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.informationflow" label="InformationFlow" description="Create new InformationFlow" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InformationFlow.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationFlow_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.manifestation" label="Manifestation" description="Create new Manifestation" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Manifestation_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="composite.tool.deployment" label="Deployment" description="Create new Deployment" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Deployment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Deployment_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
index 6331cfd1436..3d6b0419a1d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.elementtypesconfigurations
@@ -1,15 +1,15 @@
-<?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="_tL86sLazEeSbnofizoRSMQ" identifier="org.eclipse.papyrus.uml.diagram.composite.elementTypeSet" name="CompositeStructure" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_0kx7YLgREeSsJKs23mSE-A" description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted" identifier="org.eclipse.papyrus.uml.diagram.composite.GeneralizationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.GeneralizationHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Generalization"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_tL86sLazEeSbnofizoRSMQ" identifier="org.eclipse.papyrus.uml.diagram.composite.elementTypeSet" name="CompositeStructure" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_0kx7YLgREeSsJKs23mSE-A" description="Generalizarion specific advices (remove inconsistent views when a Generalization is deleted" identifier="org.eclipse.papyrus.uml.diagram.composite.GeneralizationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.GeneralizationHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Generalization"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_DnjXALgSEeSsJKs23mSE-A" description="Property specific advices (remove inconsistent views when a Property type is set" identifier="org.eclipse.papyrus.uml.diagram.composite.PropertyHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.PropertyHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_DnjXALgSEeSsJKs23mSE-A" description="Property specific advices (remove inconsistent views when a Property type is set" identifier="org.eclipse.papyrus.uml.diagram.composite.PropertyHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.PropertyHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Q8xrsLgSEeSsJKs23mSE-A" description="Collaboration specific advices (remove inconsistent views when a CollaborationRole is removed" identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.CollaborationHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Q8xrsLgSEeSsJKs23mSE-A" description="Collaboration specific advices (remove inconsistent views when a CollaborationRole is removed" identifier="org.eclipse.papyrus.uml.diagram.composite.CollaborationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.custom.helper.advice.CollaborationHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_o7Pa8E9QEeaJ1LBTnqBlMQ" description="Advice specific to the visualization of ports in compositr structure diagrams" identifier="org.eclipse.papyrus.uml.diagram.composite.PortAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.internal.custom.helper.advice.PortAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_o7Pa8E9QEeaJ1LBTnqBlMQ" description="Advice specific to the visualization of ports in compositr structure diagrams" identifier="org.eclipse.papyrus.uml.diagram.composite.PortAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.composite.internal.custom.helper.advice.PortAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </adviceBindingsConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
index d5f807cea98..ac4024479a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0
  org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.1.0,4.0.0)"
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)"
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 2.0.100.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
index 79ea58c7d3d..339d6395f2e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-v
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.preferences;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.core.runtime,
@@ -68,7 +68,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-v
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.100.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment;singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/PapyrusUMLDeploymentDiagram.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/PapyrusUMLDeploymentDiagram.paletteconfiguration
index 6b69eff7e20..eaf244c1dc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/PapyrusUMLDeploymentDiagram.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/model/PapyrusUMLDeploymentDiagram.paletteconfiguration
@@ -1,282 +1,156 @@
-<?xml version="1.0" encoding="ASCII"?>
-<?gmfgen generated="true"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8"
-	xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
-	id="org.eclipse.papyrus.uml.diagram.deployment.paletteconfiguration"
-	label="Papyrus Deployment Diagram  Palette"
-	description="This is the palette of Papyrus Deployment Diagram ">
-	<drawerConfigurations
-		id="deployment.group.nodes"
-		label="Nodes"
-		description="Nodes">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.artifact" 
-			label="Artifact"
-			description="Create new Artifact">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_Shape_CCN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_Shape_ACN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.comment" 
-			label="Comment"
-			description="Create new Comment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.constraint" 
-			label="Constraint"
-			description="Create new Constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.device" 
-			label="Device"
-			description="Create new Device">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Device_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Device_Shape_CCN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Device_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.deploymentspecification" 
-			label="DeploymentSpecification"
-			description="Create new DeploymentSpecification">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CCN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_ACN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.executionEnvironment" 
-			label="Execution Environment"
-			description="Create new ExecutionEnvironment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CCN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createModelCreationTool" 
-			label="Model"
-			description="Create a model">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.node" 
-			label="Node"
-			description="Create new Node">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_Shape_CCN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.package" 
-			label="Package"
-			description="Create a Package">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
-	<drawerConfigurations
-		id="deployment.group.links"
-		label="Links"
-		description="Links">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.communicationpath" 
-			label="CommunicationPath"
-			description="" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CommunicationPath.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CommunicationPath_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.dependency" 
-			label="Dependency"
-			description="Create new Dependency" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.dependencybranch" 
-			label="DependencyBranch"
-			description="Create a dependency branch" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_BranchEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.deployment" 
-			label="Deployment"
-			description="Create new Deployment" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Deployment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Deployment_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.generalization" 
-			label="Generalization"
-			description="Create new Generalization" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.link" 
-			label="Link"
-			description="Create new Link (Comment / Constraint)" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.deployment" iconPath="icons/obj16/Link.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="deployment.tool.manifestation" 
-			label="Manifestation"
-			description="Create new Manifestation" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Manifestation_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.deployment.paletteconfiguration" label="Papyrus Deployment Diagram  Palette" description="This is the palette of Papyrus Deployment Diagram ">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="deployment.group.nodes" label="Nodes" description="Nodes">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.artifact" label="Artifact" description="Create new Artifact" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Artifact.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_Shape_CCN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_Shape_ACN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.comment" label="Comment" description="Create new Comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.constraint" label="Constraint" description="Create new Constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.device" label="Device" description="Create new Device" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Device.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Device_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Device_Shape_CCN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Device_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.deploymentspecification" label="DeploymentSpecification" description="Create new DeploymentSpecification" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DeploymentSpecification.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CCN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_ACN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.executionEnvironment" label="Execution Environment" description="Create new ExecutionEnvironment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExecutionEnvironment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CCN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createModelCreationTool" label="Model" description="Create a model" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Model.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Model_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.node" label="Node" description="Create new Node" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Node.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_Shape_CCN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.package" label="Package" description="Create a Package" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="deployment.group.links" label="Links" description="Links">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.communicationpath" label="CommunicationPath" description="" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CommunicationPath.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CommunicationPath_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.dependency" label="Dependency" description="Create new Dependency" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.dependencybranch" label="DependencyBranch" description="Create a dependency branch" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_BranchEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.deployment" label="Deployment" description="Create new Deployment" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Deployment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Deployment_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.generalization" label="Generalization" description="Create new Generalization" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.link" label="Link" description="Create new Link (Comment / Constraint)" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.deployment" iconPath="icons/obj16/Link.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="deployment.tool.manifestation" label="Manifestation" description="Create new Manifestation" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Manifestation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Manifestation_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml
index 15e28a5c420..a3d82b77a26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/pom.xml
@@ -7,6 +7,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.deployment</artifactId>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations
index b4e5412eb22..6dd868fd587 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/model/interactionOverviewDiagram.elementtypesconfigurations
@@ -1,6 +1,6 @@
-<?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="_x8G0YGaNEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.elementTypeSet" name="elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionUseShape"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_x8G0YGaNEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.elementTypeSet" name="elementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_zAcw0GaOEeSyJIsxLao1Pw" identifier="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionUseEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionUseShape"/>
   </adviceBindingsConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/PapyrusInteractionOverviewDiagram.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/PapyrusInteractionOverviewDiagram.paletteconfiguration
index 83522c00fa7..7afbc1a6a92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/PapyrusInteractionOverviewDiagram.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/palettes/PapyrusInteractionOverviewDiagram.paletteconfiguration
@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.interactionoverview.paletteconfiguration" label="InteractionOverviewDiagram Palette" description="this is the palette of InteractionOverviewDiagram">
-  <drawerConfigurations id="interactionoverview.drawer.nodes" label="Nodes" description="">
-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.activity" label="Activity" description="Create a new Activity">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.interactionoverview.paletteconfiguration" label="InteractionOverviewDiagram Palette" description="this is the palette of InteractionOverviewDiagram">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="interactionoverview.drawer.nodes" label="Nodes" description="">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.activity" label="Activity" description="Create a new Activity" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape_CN"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_Shape_CN"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.initialnode" label="InitialNode" description="Create a new InitialNode">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InitialNode_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.initialnode" label="InitialNode" description="Create a new InitialNode" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InitialNode_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.activityfinalnode" label="ActivityFinalNode" description="Create a new ActivityFinalNode">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityFinalNode.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityFinalNode_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.activityfinalnode" label="ActivityFinalNode" description="Create a new ActivityFinalNode" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityFinalNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActivityFinalNode_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.flowfinalnode" label="FlowFinalNode" description="Create a new FlowFinalNode">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FlowFinalNode_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.flowfinalnode" label="FlowFinalNode" description="Create a new FlowFinalNode" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FlowFinalNode_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.decisionnode" label="DecisionNode" description="Create a new DecisionNode">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DecisionNode_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.decisionnode" label="DecisionNode" description="Create a new DecisionNode" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DecisionNode_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.forknode" label="ForkNode" description="Create a new ForkNode">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ForkNode_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.forknode" label="ForkNode" description="Create a new ForkNode" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ForkNode_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.joinnode" label="JoinNode" description="Create a new JoinNode">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.JoinNode_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.joinnode" label="JoinNode" description="Create a new JoinNode" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.JoinNode_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.mergenode" label="MergeNode" description="Create a new MergeNode">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.MergeNode_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.mergenode" label="MergeNode" description="Create a new MergeNode" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.MergeNode_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.conditionalnode" label="ConditionalNode" description="Create a new ConditionalNode">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConditionalNode.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConditionalNode_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.conditionalnode" label="ConditionalNode" description="Create a new ConditionalNode" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConditionalNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConditionalNode_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.loopnode" label="LoopNode" description="Create a new LoopNode">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.LoopNode_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.loopnode" label="LoopNode" description="Create a new LoopNode" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.LoopNode_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.sequencenode" label="SequenceNode" description="Create a new SequenceNode">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SequenceNode.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SequenceNode_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.sequencenode" label="SequenceNode" description="Create a new SequenceNode" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SequenceNode.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.SequenceNode_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.comment" label="Comment" description="Create a new Comment">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.comment" label="Comment" description="Create a new Comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.constraint" label="Constraint" description="Create a new Constraint">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.constraint" label="Constraint" description="Create a new Constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverview.drawer.nodes.interaction" label="Interaction" description="Create a new Interaction">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interaction.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionShape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverview.drawer.nodes.interaction" label="Interaction" description="Create a new Interaction" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interaction.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionShape"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverview.drawer.nodes.interactionuse" label="Interaction Use" description="Create a new InteractionUse">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionUse.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionUseShape"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverview.drawer.nodes.interactionuse" label="Interaction Use" description="Create a new InteractionUse" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionUse.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionUseShape"/>
       </elementDescriptors>
     </ownedConfigurations>
   </drawerConfigurations>
-  <drawerConfigurations id="interactionoverview.drawer.edges" label="Edges">
-    <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.commentannotatedelement" label="CommentAnnotatedElement" description="Create a new CommentAnnotatedElement" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.uml.diagram.activity" iconPath="/icons/obj16/Link.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="interactionoverview.drawer.edges" label="Edges">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.commentannotatedelement" label="CommentAnnotatedElement" description="Create a new CommentAnnotatedElement" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.activity" iconPath="/icons/obj16/Link.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
       </elementDescriptors>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
       </elementDescriptors>
     </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.controlflow" label="ControlFlow" description="Create a new ControlFlow" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif"/>
-      <elementDescriptors>
-        <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ControlFlow_Edge"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="interactionoverviewdiagram.tool.controlflow" label="ControlFlow" description="Create a new ControlFlow" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ControlFlow_Edge"/>
       </elementDescriptors>
     </ownedConfigurations>
   </drawerConfigurations>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF
index fd199349c72..2f65c45420c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.linklf;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.linklf.PapyrusLinkLFActivator
 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/pom.xml
index 7e728cc729f..a69f7b0cf30 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/pom.xml
@@ -6,6 +6,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.linklf</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
index b053f39d913..3647ceced5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.modelexplorer.Activator
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/pom.xml
index b4ece1e090b..afc574d42c5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/pom.xml
@@ -8,6 +8,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.modelexplorer</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
index aaa6c33dd75..7a465ad303f 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -57,7 +57,7 @@ Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",
@@ -75,10 +75,10 @@ Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gef,
  org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.100.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-Description: %pluginDescription
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/PapyrusUMLProfileDiagram.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/PapyrusUMLProfileDiagram.paletteconfiguration
index 1ad85ff57b6..81d65f9f812 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/PapyrusUMLProfileDiagram.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/PapyrusUMLProfileDiagram.paletteconfiguration
@@ -1,295 +1,162 @@
-<?xml version="1.0" encoding="ASCII"?>
-<?gmfgen generated="true"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8"
-	xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
-	id="org.eclipse.papyrus.uml.diagram.profile.paletteconfiguration"
-	label="PapyrusUMLProfileDiagram Palette"
-	description="This is the palette of PapyrusUMLProfileDiagram">
-	<drawerConfigurations
-		id="createNodes1Group"
-		label="Nodes"
-		description="Nodes">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createClass6CreationTool" 
-			label="Class"
-			description="Create a new Class">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createComment2CreationTool" 
-			label="Comment"
-			description="Create new comment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createConstraint3CreationTool" 
-			label="Constraint"
-			description="Create a constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_PackagedElementShape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createDataType4CreationTool" 
-			label="DataType"
-			description="Create new DataType">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createEnumeration5CreationTool" 
-			label="Enumeration"
-			description="Create new Enumeration">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createEnumerationLiteral6CreationTool" 
-			label="EnumerationLiteral"
-			description="Add new EnumerationLiteral">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createImportMetaclass7CreationTool" 
-			label="Import Metaclass"
-			description="Import a new Metaclass">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.profile" iconPath="/icons/Metaclass.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_MetaclassShape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_MetaclassShape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createOperation8CreationTool" 
-			label="Operation"
-			description="Add new operation">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_ClassOperationLabel"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createPackage9CreationTool" 
-			label="Package"
-			description="Create a new Package">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createProfile10CreationTool" 
-			label="Profile"
-			description="Add a new Profile">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Profile_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Profile_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createPrimitiveType11CreationTool" 
-			label="PrimitiveType"
-			description="Create new PrimitiveType">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createProperty12CreationTool" 
-			label="Property"
-			description="Add new property">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_ClassAttributeLabel"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createStereotype13CreationTool" 
-			label="Stereotype"
-			description="Add new Stereotype">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Stereotype_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Stereotype_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
-	<drawerConfigurations
-		id="createEdges2Group"
-		label="Edges"
-		description="Edges">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createAssociation1CreationTool" 
-			label="Association"
-			description="Create an Association" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationNonDirected_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createContextLink6CreationTool" 
-			label="ContextLink"
-			description="Creation of a context link for a Constraint" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ContextEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createExtension3CreationTool" 
-			label="Extension"
-			description="Add an Extension" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extension.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Extension_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createGeneralization4CreationTool" 
-			label="Generalization"
-			description="Create a generalization" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createLink5CreationTool" 
-			label="Link"
-			description="Create a link for Comment, Constraint" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.profile" iconPath="icons/obj16/Link.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createProfileApplication6CreationTool" 
-			label="ProfileApplication"
-			description="Create a ProfileApplication" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProfileApplication_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.profile.paletteconfiguration" label="PapyrusUMLProfileDiagram Palette" description="This is the palette of PapyrusUMLProfileDiagram">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="createNodes1Group" label="Nodes" description="Nodes">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createClass6CreationTool" label="Class" description="Create a new Class" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Class.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createComment2CreationTool" label="Comment" description="Create new comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createConstraint3CreationTool" label="Constraint" description="Create a constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_PackagedElementShape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createDataType4CreationTool" label="DataType" description="Create new DataType" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createEnumeration5CreationTool" label="Enumeration" description="Create new Enumeration" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createEnumerationLiteral6CreationTool" label="EnumerationLiteral" description="Add new EnumerationLiteral" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createImportMetaclass7CreationTool" label="Import Metaclass" description="Import a new Metaclass" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.profile" iconPath="/icons/Metaclass.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_MetaclassShape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_MetaclassShape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createOperation8CreationTool" label="Operation" description="Add new operation" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_ClassOperationLabel"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createPackage9CreationTool" label="Package" description="Create a new Package" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createProfile10CreationTool" label="Profile" description="Add a new Profile" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Profile.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Profile_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Profile_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createPrimitiveType11CreationTool" label="PrimitiveType" description="Create new PrimitiveType" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createProperty12CreationTool" label="Property" description="Add new property" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_ClassAttributeLabel"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createStereotype13CreationTool" label="Stereotype" description="Add new Stereotype" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Stereotype.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Stereotype_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Stereotype_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="createEdges2Group" label="Edges" description="Edges">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createAssociation1CreationTool" label="Association" description="Create an Association" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationNonDirected_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createContextLink6CreationTool" label="ContextLink" description="Creation of a context link for a Constraint" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ContextEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createExtension3CreationTool" label="Extension" description="Add an Extension" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extension.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Extension_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createGeneralization4CreationTool" label="Generalization" description="Create a generalization" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createLink5CreationTool" label="Link" description="Create a link for Comment, Constraint" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.profile" iconPath="icons/obj16/Link.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createProfileApplication6CreationTool" label="ProfileApplication" description="Create a ProfileApplication" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ProfileApplication.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProfileApplication_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml
index eddfdeb8814..ed74eff906c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/pom.xml
@@ -7,6 +7,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
     <artifactId>org.eclipse.papyrus.uml.diagram.profile</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index f4da8ebfc22..afd9db21e9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
@@ -69,7 +69,7 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili
  org.eclipse.papyrus.uml.service.validation;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 5.0.100.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java
index 800f86195e9..34f48364451 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/AbstractExecutionSpecificationEditPart.java
@@ -226,6 +226,9 @@ public abstract class AbstractExecutionSpecificationEditPart extends RoundedComp
 	@Override
 	public abstract ExecutionSpecificationRectangleFigure getPrimaryShape();
 
+	/**
+	 * @since 5.0
+	 */
 	protected void moveExecutionSpecificationFeedback(ChangeBoundsRequest request, AbstractExecutionSpecificationEditPart movedPart, PrecisionRectangle rect, Rectangle originalBounds) {
 
 		// If this is a move to the top, the execution specification cannot be moved upper than the life line y position
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration
index c853ba16231..e3e21344818 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/PapyrusUMLSequenceDiagram.paletteconfiguration
@@ -1,325 +1,174 @@
-<?xml version="1.0" encoding="ASCII"?>
-<?gmfgen generated="true"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8"
-	xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
-	id="org.eclipse.papyrus.uml.diagram.sequence.paletteconfiguration"
-	label="UML Plugin Palette"
-	description="This is the palette of UML Plugin">
-	<drawerConfigurations
-		id="createNodes1Group"
-		label="Nodes"
-		description="">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createLifeline1CreationTool" 
-			label="Lifeline"
-			description="Create a Lifeline">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Lifeline.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Lifeline_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createActionExecutionSpecification2CreationTool" 
-			label="Action Execution Specification"
-			description="Create an Action Execution Specification">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionExecutionSpecification.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionExecutionSpecification_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createBehaviorExecutionSpecification3CreationTool" 
-			label=" Behavior Execution Specification"
-			description="Create an BehaviorExecutionSpecification">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BehaviorExecutionSpecification.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createInteractionUse4CreationTool" 
-			label="InteractionUse"
-			description="Create InteractionUse">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionUse.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InteractionUse_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createCombinedFragment5CreationTool" 
-			label="Combined Fragment"
-			description="Create Combined Fragment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CombinedFragment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CombinedFragment_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createInteractionOperand6CreationTool" 
-			label="Interaction Operand"
-			description="Create Interaction Operand">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionOperand.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InteractionOperand_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createContinuation7CreationTool" 
-			label="Continuation"
-			description="Create Continuation">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Continuation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Continuation_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createStateInvariant8CreationTool" 
-			label="StateInvariant"
-			description="Create StateInvariant">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateInvariant.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateInvariant_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createComment9CreationTool" 
-			label="Comment"
-			description="Create a comment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createConstraint10CreationTool" 
-			label="Constraint"
-			description="Create a constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createDurationObservation11CreationTool" 
-			label="Duration Observation"
-			description="Create a Duration Observation on a Message">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createTimeConstraint12CreationTool" 
-			label="Time Constraint"
-			description="Create a Time Constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeConstraint_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createTimeObservation13CreationTool" 
-			label="Time Observation"
-			description="Create a Time Observation">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createDurationConstraint14CreationTool" 
-			label="Duration Constraint"
-			description="Create a Duration Constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationConstraint_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationConstraint_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createNEWGateCreationTool" 
-			label="Gate"
-			description="New create a gate">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Gate.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Gate_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createConsiderIgnoreFragment16CreationTool" 
-			label="ConsiderIgnoreFragment"
-			description="Create a Consider Ignore Fragment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConsiderIgnoreFragment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
-	<drawerConfigurations
-		id="createEdges2Group"
-		label="Edges"
-		description="Message tools">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createMessageSync1CreationTool" 
-			label="Message Sync"
-			description="Create MessageSync" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_synchCall.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_SynchEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createMessageAsync2CreationTool" 
-			label="Message Async"
-			description="Create MessageAsync" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_asynchCall.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_AsynchEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createMessageReply3CreationTool" 
-			label="Message Reply"
-			description="Create MessageReply" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_reply.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_ReplyEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createMessageCreate4CreationTool" 
-			label="Message Create"
-			description="Create MessageCreate" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_createMessage.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_CreateEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createMessageDelete5CreationTool" 
-			label="Message Delete"
-			description="Create MessageDelete" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_deleteMessage.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_DeleteEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createMessageLost6CreationTool" 
-			label="Message Lost"
-			description="Create MessageLost" kind="ConnectionTool"
-        	toolClassName="org.eclipse.papyrus.uml.diagram.sequence.tools.MessageLostFoundConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_LostEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createMessageFound7CreationTool" 
-			label="Message Found"
-			description="Create MessageFound" kind="ConnectionTool"
-        	toolClassName="org.eclipse.papyrus.uml.diagram.sequence.tools.MessageLostFoundConnectionTool">
-        	<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_FoundEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createGeneralOrdering8CreationTool" 
-			label="General Ordering"
-			description="Create GeneralOrdering" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/GeneralOrdering.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.GeneralOrdering_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createCommentlink9CreationTool" 
-			label="Comment link"
-			description="Create a comment link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createConstraintlink10CreationTool" 
-			label="Constraint link"
-			description="Create a constraint link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="createContextLink11CreationTool" 
-			label="ContextLink"
-			description="Creation of a context link for a Constraint" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ContextEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.sequence.paletteconfiguration" label="UML Plugin Palette" description="This is the palette of UML Plugin">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="createNodes1Group" label="Nodes" description="">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createLifeline1CreationTool" label="Lifeline" description="Create a Lifeline" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Lifeline.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Lifeline_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createActionExecutionSpecification2CreationTool" label="Action Execution Specification" description="Create an Action Execution Specification" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActionExecutionSpecification.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ActionExecutionSpecification_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createBehaviorExecutionSpecification3CreationTool" label=" Behavior Execution Specification" description="Create an BehaviorExecutionSpecification" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/BehaviorExecutionSpecification.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createInteractionUse4CreationTool" label="InteractionUse" description="Create InteractionUse" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionUse.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InteractionUse_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createCombinedFragment5CreationTool" label="Combined Fragment" description="Create Combined Fragment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CombinedFragment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CombinedFragment_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createInteractionOperand6CreationTool" label="Interaction Operand" description="Create Interaction Operand" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InteractionOperand.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InteractionOperand_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createContinuation7CreationTool" label="Continuation" description="Create Continuation" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Continuation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Continuation_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createStateInvariant8CreationTool" label="StateInvariant" description="Create StateInvariant" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateInvariant.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateInvariant_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createComment9CreationTool" label="Comment" description="Create a comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createConstraint10CreationTool" label="Constraint" description="Create a constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createDurationObservation11CreationTool" label="Duration Observation" description="Create a Duration Observation on a Message" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationObservation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationObservation_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createTimeConstraint12CreationTool" label="Time Constraint" description="Create a Time Constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeConstraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeConstraint_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createTimeObservation13CreationTool" label="Time Observation" description="Create a Time Observation" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/TimeObservation.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.TimeObservation_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createDurationConstraint14CreationTool" label="Duration Constraint" description="Create a Duration Constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DurationConstraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationConstraint_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DurationConstraint_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createNEWGateCreationTool" label="Gate" description="New create a gate" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Gate.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Gate_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createConsiderIgnoreFragment16CreationTool" label="ConsiderIgnoreFragment" description="Create a Consider Ignore Fragment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConsiderIgnoreFragment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="createEdges2Group" label="Edges" description="Message tools">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createMessageSync1CreationTool" label="Message Sync" description="Create MessageSync" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_synchCall.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_SynchEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createMessageAsync2CreationTool" label="Message Async" description="Create MessageAsync" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_asynchCall.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_AsynchEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createMessageReply3CreationTool" label="Message Reply" description="Create MessageReply" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_reply.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_ReplyEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createMessageCreate4CreationTool" label="Message Create" description="Create MessageCreate" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_createMessage.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_CreateEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createMessageDelete5CreationTool" label="Message Delete" description="Create MessageDelete" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message_deleteMessage.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_DeleteEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createMessageLost6CreationTool" label="Message Lost" description="Create MessageLost" kind="ConnectionTool" toolClassName="org.eclipse.papyrus.uml.diagram.sequence.tools.MessageLostFoundConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_LostEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createMessageFound7CreationTool" label="Message Found" description="Create MessageFound" kind="ConnectionTool" toolClassName="org.eclipse.papyrus.uml.diagram.sequence.tools.MessageLostFoundConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Message.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Message_FoundEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createGeneralOrdering8CreationTool" label="General Ordering" description="Create GeneralOrdering" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/GeneralOrdering.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.GeneralOrdering_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createCommentlink9CreationTool" label="Comment link" description="Create a comment link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createConstraintlink10CreationTool" label="Constraint link" description="Create a constraint link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="createContextLink11CreationTool" label="ContextLink" description="Creation of a context link for a Constraint" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ContextEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
index 908662af5b3..eb6100e75c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
@@ -7,6 +7,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.sequence</artifactId>
-	<version>5.0.0-SNAPSHOT</version>
+	<version>5.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
index a50088ae15b..190e542d60a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF
@@ -44,7 +44,7 @@ Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12
  org.eclipse.papyrus.infra.gmfdiag.preferences;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/PapyrusUMLStateMachineDiagram.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/PapyrusUMLStateMachineDiagram.paletteconfiguration
index b8a291dd4fb..01f4ab144f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/PapyrusUMLStateMachineDiagram.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/PapyrusUMLStateMachineDiagram.paletteconfiguration
@@ -1,235 +1,126 @@
-<?xml version="1.0" encoding="ASCII"?>
-<?gmfgen generated="true"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8"
-	xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
-	id="org.eclipse.papyrus.uml.diagram.statemachine.paletteconfiguration"
-	label="PapyrusUMLStateMachineDiagram Palette"
-	description="This is the palette of PapyrusUMLStateMachineDiagram">
-	<drawerConfigurations
-		id="createNodesGroup"
-		label="Nodes"
-		description="">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.region" 
-			label="Region"
-			description="Region">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Region.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Region_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.state" 
-			label="State"
-			description="State">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/State.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.State_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.initial" 
-			label="Initial"
-			description="Initial">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_initial.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_InitialShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.finalstate" 
-			label="FinalState"
-			description="FinalState">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalState.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FinalState_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.shallowhistory" 
-			label="ShallowHistory"
-			description="ShallowHistory">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_shallowHistory.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ShallowHistoryShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.deephistory" 
-			label="DeepHistory"
-			description="DeepHistory">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_deepHistory.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_DeepHistoryShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.fork" 
-			label="Fork"
-			description="Fork">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_fork.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ForkShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.join" 
-			label="Join"
-			description="Join">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_join.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_JoinShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.choice" 
-			label="Choice"
-			description="Choice">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_choice.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ChoiceShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.junction" 
-			label="Junction"
-			description="Junction">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_junction.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_JunctionShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.entrypoint" 
-			label="EntryPoint"
-			description="EntryPoint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_entryPoint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_EntryPointShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.exitpoint" 
-			label="ExitPoint"
-			description="ExitPoint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_exitPoint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ExitPointShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.terminate" 
-			label="Terminate"
-			description="Terminate">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_terminate.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_TerminateShape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.connectionpointreference" 
-			label="ConnectionPointReference"
-			description="ConnectionPointReference">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectionPointReference.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConnectionPointReference_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.comment" 
-			label="Comment"
-			description="Comment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createNodesGroup.constraint" 
-			label="Constraint"
-			description="Create Constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
-	<drawerConfigurations
-		id="createEdgesGroup"
-		label="Edges"
-		description="">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createEdgesGroup.transition" 
-			label="Transition"
-			description="Transition" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Transition_local.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Transition_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createEdgesGroup.link" 
-			label="Link"
-			description="Creation of a link for comment, constraint" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.papyrus.uml.diagram.statemachine" iconPath="icons/obj16/Link.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="statemachine.createEdgesGroup.contextlink" 
-			label="ContextLink"
-			description="Creation of a context link for a Constraint" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ContextEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.statemachine.paletteconfiguration" label="PapyrusUMLStateMachineDiagram Palette" description="This is the palette of PapyrusUMLStateMachineDiagram">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="createNodesGroup" label="Nodes" description="">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.region" label="Region" description="Region" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Region.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Region_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.state" label="State" description="State" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/State.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.State_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.initial" label="Initial" description="Initial" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_initial.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_InitialShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.finalstate" label="FinalState" description="FinalState" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalState.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FinalState_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.shallowhistory" label="ShallowHistory" description="ShallowHistory" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_shallowHistory.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ShallowHistoryShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.deephistory" label="DeepHistory" description="DeepHistory" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_deepHistory.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_DeepHistoryShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.fork" label="Fork" description="Fork" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_fork.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ForkShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.join" label="Join" description="Join" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_join.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_JoinShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.choice" label="Choice" description="Choice" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_choice.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ChoiceShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.junction" label="Junction" description="Junction" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_junction.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_JunctionShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.entrypoint" label="EntryPoint" description="EntryPoint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_entryPoint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_EntryPointShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.exitpoint" label="ExitPoint" description="ExitPoint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_exitPoint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ExitPointShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.terminate" label="Terminate" description="Terminate" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_terminate.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_TerminateShape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.connectionpointreference" label="ConnectionPointReference" description="ConnectionPointReference" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectionPointReference.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConnectionPointReference_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.comment" label="Comment" description="Comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createNodesGroup.constraint" label="Constraint" description="Create Constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="createEdgesGroup" label="Edges" description="">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createEdgesGroup.transition" label="Transition" description="Transition" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Transition_local.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Transition_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createEdgesGroup.link" label="Link" description="Creation of a link for comment, constraint" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.papyrus.uml.diagram.statemachine" iconPath="icons/obj16/Link.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="statemachine.createEdgesGroup.contextlink" label="ContextLink" description="Creation of a context link for a Constraint" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ContextEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations
index 4669526acba..dda9a82f160 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.elementtypesconfigurations
@@ -1,9 +1,9 @@
-<?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="_wYwtMMeDEeSwP_9Vn5UnWg" identifier="org.eclipse.papyrus.uml.diagram.statemachine.elementTypeSet" name="PapyrusUMLStateMachineDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Gdt5EMf7EeSG9OkAifWKOg" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateMachine_Shape"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_wYwtMMeDEeSwP_9Vn5UnWg" identifier="org.eclipse.papyrus.uml.diagram.statemachine.elementTypeSet" name="PapyrusUMLStateMachineDiagram" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Gdt5EMf7EeSG9OkAifWKOg" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.DeleteRegionHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateMachine_Shape"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_3RjqQMwTEeSyj5ums1L-vQ" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.State_Shape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_3RjqQMwTEeSyj5ums1L-vQ" identifier="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.ConnectionPointReferenceInStateHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.State_Shape"/>
   </adviceBindingsConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
index 5275084623f..3f599987715 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
@@ -6,11 +6,11 @@ Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,
 Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.Activator
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations
index ae1533ecc87..d4d31af0caa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/model/stereotype-edit.elementtypesconfigurations
@@ -1,6 +1,6 @@
-<?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="_ScP1oFYCEeS0WsAAtVmToA" description="Advice definitions supporting the editing of stereotypes." identifier="org.eclipse.papyrus.uml.diagram.stereotype.edition.advice" name="Stereotype Editing Advice" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_4rSa8Dm8EeWMHpLNzlgfaQ" description="Adds applied-stereotype views to the dependents of a notation view that is being deleted." identifier="org.eclipse.papyrus.uml.diagram.stereotype.edition.advice.AppliedStereotypeNotationDependents" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.stereotype.edition.internal.edithelper.advice.AppliedStereotypeNotationDependentsAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" description="Advice definitions supporting the editing of stereotypes." identifier="org.eclipse.papyrus.uml.diagram.stereotype.edition.advice" name="Stereotype Editing Advice" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_4rSa8Dm8EeWMHpLNzlgfaQ" description="Adds applied-stereotype views to the dependents of a notation view that is being deleted." identifier="org.eclipse.papyrus.uml.diagram.stereotype.edition.advice.AppliedStereotypeNotationDependents" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.stereotype.edition.internal.edithelper.advice.AppliedStereotypeNotationDependentsAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element"/>
   </adviceBindingsConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml
index 6a85d912b34..9ed0aa8e6ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/pom.xml
@@ -7,6 +7,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.stereotype.edition</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
index 93becd340bc..229da57f1d2 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF
@@ -31,7 +31,7 @@ Bundle-Name: %pluginName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
@@ -45,7 +45,7 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Eclipse-LazyStart: true
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.100.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing;singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations
index 1be16476c46..b926aeeb11b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/model/timingdiagram-uml.elementtypesconfigurations
@@ -1,17 +1,17 @@
-<?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="_BJMa0PyeEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.uml.elementTypeSet" name="PapyrusUMLTimingDiagramUML" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:ExternallyRegisteredType" xmi:id="org.eclipse.gmf.runtime.emf.type.core.default" identifier="org.eclipse.gmf.runtime.emf.type.core.default" name="DefaultMetamodelType"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_nL7yIPyeEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.GateHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.GateHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Gate"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_BJMa0PyeEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.uml.elementTypeSet" name="PapyrusUMLTimingDiagramUML" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:ExternallyRegisteredType" xmi:id="org.eclipse.gmf.runtime.emf.type.core.default" identifier="org.eclipse.gmf.runtime.emf.type.core.default" name="DefaultMetamodelType" hint="" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_nL7yIPyeEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.GateHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.GateHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Gate"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_PIoBwPysEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecificationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.OccurrenceSpecificationHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OccurrenceSpecification"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_PIoBwPysEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.OccurrenceSpecificationHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.OccurrenceSpecificationHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OccurrenceSpecification"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jztwwPysEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.StateInvariantHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.StateInvariantHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateInvariant"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_jztwwPysEeWbo9Y7g2MLdw" identifier="org.eclipse.papyrus.uml.diagram.timing.StateInvariantHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.StateInvariantHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateInvariant"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_InLNAACIEeauW73l_j0dpw" identifier="org.eclipse.papyrus.uml.diagram.timing.DefaultTypeHelperAdvice" target="org.eclipse.gmf.runtime.emf.type.core.default" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.DefaultTypeHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_upuh0ACuEeaVcbLzq0LlyQ" identifier="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.StateDefinitionHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_StateDefinitionShape"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_InLNAACIEeauW73l_j0dpw" identifier="org.eclipse.papyrus.uml.diagram.timing.DefaultTypeHelperAdvice" target="org.eclipse.gmf.runtime.emf.type.core.default" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.DefaultTypeHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_upuh0ACuEeaVcbLzq0LlyQ" identifier="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.timing.custom.helper.advice.StateDefinitionHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_StateDefinitionShape"/>
   </adviceBindingsConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml
index b6d724fe258..596181b06ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml
@@ -6,6 +6,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.diagram.timing</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.4.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
index 568877742fe..de73e5d3c72 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version=
  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/UseCase.paletteconfiguration b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/UseCase.paletteconfiguration
index 766c19c0c38..c92f9661e06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/UseCase.paletteconfiguration
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/UseCase.paletteconfiguration
@@ -1,280 +1,153 @@
-<?xml version="1.0" encoding="ASCII"?>
-<?gmfgen generated="true"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8"
-	xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2"
-	id="org.eclipse.papyrus.uml.diagram.usecase.paletteconfiguration"
-	label="Papyrus useCase editor Plugin Palette"
-	description="This is the palette of Papyrus useCase editor Plugin">
-	<drawerConfigurations
-		id="usecase.group.nodes"
-		label="Nodes"
-		description="Diagram Nodes">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.package" 
-			label="Package"
-			description="Create Package">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.subject" 
-			label="Subject"
-			description="Create Subject">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Classifier_SubjectShape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.actor" 
-			label="Actor"
-			description="Create Actor">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CCN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.usecase" 
-			label="Use Case"
-			description="Create Use Case">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape_CCN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape_CN"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.constraint" 
-			label="Constraint"
-			description="Create Constraint">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape_CCN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.comment" 
-			label="Comment"
-			description="Create Comment">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.extensionpoint" 
-			label="Extension Point"
-			description="Create Extension Point">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel"/>
-			</elementDescriptors>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
-	<drawerConfigurations
-		id="usecase.group.links"
-		label="Links"
-		description="Diagram Links">
-		<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.association" 
-			label="Association"
-			description="Create Association Link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationNonDirected_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.generalization" 
-			label="Generalization"
-			description="Create Generalization Link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.dependency" 
-			label="Dependency"
-			description="Create Dependency Link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.abstraction" 
-			label="Abstraction"
-			description="Create Abstraction Link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Abstraction_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.realization" 
-			label="Realization"
-			description="Create Realization Link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Realization_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.usage" 
-			label="Usage"
-			description="Create Usage Link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Usage_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.packagemerge" 
-			label="PackageMerge"
-			description="Create PackageMerge Link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PackageMerge_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.packageimport" 
-			label="PackageImport"
-			description="Create PackageImport Link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PackageImport_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.include" 
-			label="Include"
-			description="Create Include Link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Include.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Include_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.extend" 
-			label="Extend"
-			description="Create Extend" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extend.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Extend_Edge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.constraintlink" 
-			label="Constrained Element"
-			description="Create Constrained Element" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-		<ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration"
-			id="usecase.tool.commentlink" 
-			label="Comment link"
-			description="Create Comment Link" kind="ConnectionTool">
-			<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
-			<elementDescriptors>
-				<elementType
-					xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-					href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
-			</elementDescriptors>
-		</ownedConfigurations>
-	</drawerConfigurations>
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.uml.diagram.usecase.paletteconfiguration" label="Papyrus useCase editor Plugin Palette" description="This is the palette of Papyrus useCase editor Plugin">
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="usecase.group.nodes" label="Nodes" description="Diagram Nodes">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.package" label="Package" description="Create Package" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Package_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.subject" label="Subject" description="Create Subject" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Component.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Classifier_SubjectShape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.actor" label="Actor" description="Create Actor" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CCN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.usecase" label="Use Case" description="Create Use Case" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/UseCase.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape_CCN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_Shape_CN"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.constraint" label="Constraint" description="Create Constraint" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape_CCN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.comment" label="Comment" description="Create Comment" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.extensionpoint" label="Extension Point" description="Create Extension Point" kind="CreationTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExtensionPoint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel"/>
+      </elementDescriptors>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
+  <drawerConfigurations xmi:type="paletteconfiguration:DrawerConfiguration" id="usecase.group.links" label="Links" description="Diagram Links">
+    <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.association" label="Association" description="Create Association Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationNonDirected_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.generalization" label="Generalization" description="Create Generalization Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Generalization_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.dependency" label="Dependency" description="Create Dependency Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.abstraction" label="Abstraction" description="Create Abstraction Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Abstraction_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.realization" label="Realization" description="Create Realization Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Realization_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.usage" label="Usage" description="Create Usage Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Usage_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.packagemerge" label="PackageMerge" description="Create PackageMerge Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageMerge.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PackageMerge_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.packageimport" label="PackageImport" description="Create PackageImport Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PackageImport_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.include" label="Include" description="Create Include Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Include.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Include_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.extend" label="Extend" description="Create Extend" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Extend.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Extend_Edge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.constraintlink" label="Constrained Element" description="Create Constrained Element" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+    <ownedConfigurations xmi:type="paletteconfiguration:ToolConfiguration" id="usecase.tool.commentlink" label="Comment link" description="Create Comment Link" kind="ConnectionTool">
+      <icon xmi:type="paletteconfiguration:IconDescriptor" pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+      <elementDescriptors xmi:type="paletteconfiguration:ElementDescriptor">
+        <elementType xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge"/>
+      </elementDescriptors>
+    </ownedConfigurations>
+  </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
index 8cdcc7f0706..352fe896318 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibilit
  org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)",
  org.eclipse.papyrus.infra.ui.architecture;bundle-version="[1.0.0,3.0.0)",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)"
 Bundle-Vendor: %pluginProvider
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
index d6be96f3b81..5f50d214c8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
@@ -604,6 +604,7 @@ public class CreateModelWizard extends Wizard implements INewWizard {
 	 *
 	 * @param modelSet
 	 *            the di resource set
+	 * @since 3.0
 	 */
 	protected void initDomainModelFromTemplate(ModelSet modelSet, String contextId, String[] viewpointIds) {
 		ArchitectureDescriptionUtils helper = new ArchitectureDescriptionUtils(modelSet);
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
index a98cbddad6b..a191e706e31 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
@@ -8,14 +8,15 @@ Export-Package: org.eclipse.papyrus.uml.modelexplorer,
 Require-Bundle: org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml
index e622c1fd14f..89f3bc8e2d5 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/pom.xml
@@ -7,6 +7,6 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.modelexplorer</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration
index 1366ca50c82..1a82cd3ca38 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration
@@ -39,8 +39,7 @@
     </ownedAxisConfigurations>
     <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_UJaUsDzQEei_1txcmoHe_A" detachedMode="true" pastedElementId="org.eclipse.papyrus.uml.Class">
       <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
-      <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_inl0QHl4EeWqi9yWvPfrQQ">
-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_inl0QHl4EeWqi9yWvPfrQQ" manager="_UJa7yDzQEei_1txcmoHe_A">
         <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
       </axisIdentifier>
     </ownedAxisConfigurations>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF
index 36087b2ce02..50a285327fd 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Papyrys UML Nattable Matrix
 Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.matrix;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
@@ -14,9 +14,10 @@ Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)
  org.eclipse.papyrus.infra.emf.nattable;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.110.0,4.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)"
 Bundle-Activator: org.eclipse.papyrus.uml.nattable.matrix.Activator
 Bundle-Description: This plugin provides the specific code used to managed UML Table Matrix
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/pom.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/pom.xml
index 89ca7cdad2a..8ed063dfc7f 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/pom.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix/pom.xml
@@ -8,7 +8,7 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.nattable.matrix</artifactId>
-	<version>1.0.100-SNAPSHOT</version>
+	<version>1.0.200-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<description>This plugin provides the specific code used to managed UML Table Matrix</description>
 </project>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
index 97a17865e3c..6a2c325c720 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
@@ -4,10 +4,12 @@ Export-Package: org.eclipse.papyrus.uml.nattable.menu,
  org.eclipse.papyrus.uml.nattable.menu.messages,
  org.eclipse.papyrus.uml.nattable.menu.util
 Require-Bundle: org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.100.qualifier
+Bundle-Version: 1.2.200.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Activator: org.eclipse.papyrus.uml.nattable.menu.Activator
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/pom.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/pom.xml
index e12959951ae..536c7d28ee9 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/pom.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.nattable.menu</artifactId>
-	<version>1.2.100-SNAPSHOT</version>
+	<version>1.2.200-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF
index 39f9c37d0fc..8299d6085da 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.properties;singleton:=true
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0]",
@@ -15,12 +15,13 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0]
  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.emf.nattable;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.uml.expressions;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.emf.expressions.properties;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)"
 Bundle-Activator: org.eclipse.papyrus.uml.nattable.properties.Activator
 Bundle-Description: %Bundle-Description
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/pom.xml b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/pom.xml
index 6dadb9dad16..0005ed10736 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/pom.xml
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/pom.xml
@@ -8,7 +8,7 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.nattable.properties</artifactId>
-	<version>1.0.100-SNAPSHOT</version>
+	<version>1.0.200-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<description>This plugin provides properties views specialized for Papyrus UML Table.</description>
 </project>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
index e4074ce0489..d4acfc7573b 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.13.50,4.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.apache.batik.anim;bundle-version="[1.9.1, 2.0.0)",
+ org.apache.batik.anim;bundle-version="[1.9.1,2.0.0)",
  com.google.gson;bundle-version="2.7.0",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.gmf.runtime.draw2d.ui.render.awt;bundle-version="[1.7.0,2.0.0)",
@@ -14,8 +14,9 @@ Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.13.50,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.export;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[2.0.0,3.0.0)"
 Bundle-Activator: org.eclipse.papyrus.uml.export.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
index 27bc82723dc..407f7db98ca 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.service.types.internal.ui.Activator
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations
index e1aba571498..10a760a5ea1 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/model/uml-advice.elementtypesconfigurations
@@ -1,30 +1,30 @@
-<?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="_ScP1oFYCEeS0WsAAtVmToA" description="Additional edit advices for UML that implement UI interactions" identifier="org.eclipse.papyrus.uml.service.types.ui.UMLElementTypeUIAdvices" name="UML Edit Advices with UI" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDcWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.ui.advice.ClassifierTemplateParameter" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ClassifierTemplateParameterEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClassifierTemplateParameter"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" description="Additional edit advices for UML that implement UI interactions" identifier="org.eclipse.papyrus.uml.service.types.ui.UMLElementTypeUIAdvices" name="UML Edit Advices with UI" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDcWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.ui.advice.ClassifierTemplateParameter" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ClassifierTemplateParameterEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClassifierTemplateParameter"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_XzjBAMO1EeWVMJ0KdwVfSA" description="" identifier="org.eclipse.papyrus.uml.ui.advice.CollaborationRole" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.CollaborationCollaborationRoleEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration.CollaborationRole"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_XzjBAMO1EeWVMJ0KdwVfSA" description="" identifier="org.eclipse.papyrus.uml.ui.advice.CollaborationRole" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.CollaborationCollaborationRoleEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration.CollaborationRole"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YO3rEMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.ConnectableElementTemplateParameter" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ConnectableElementTemplateParameterEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConnectableElementTemplateParameter"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YO3rEMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.ConnectableElementTemplateParameter" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ConnectableElementTemplateParameterEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConnectableElementTemplateParameter"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YZtCEMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.Extension" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ExtensionEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Extension"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YZtCEMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.Extension" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.ExtensionEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Extension"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YeHoAMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.InformationFlow" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InformationFlowEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationFlow"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YeHoAMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.InformationFlow" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InformationFlowEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationFlow"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YismAMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.InstanceSpecification.Link" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InstanceSpecificationLinkEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification.Link"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YismAMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.InstanceSpecification.Link" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.InstanceSpecificationLinkEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification.Link"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YngNgMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.OperationTemplateParameter" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.OperationTemplateParameterEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OperationTemplateParameter"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YngNgMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.OperationTemplateParameter" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.OperationTemplateParameterEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OperationTemplateParameter"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YsKrEMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.RoleBinding" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.RoleBindingHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CollaborationUse.RoleBinding"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_YsKrEMO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.RoleBinding" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.RoleBindingHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CollaborationUse.RoleBinding"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Y2rR8MO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.TemplateParameter" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.TemplateParameterEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="../../org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClassifierTemplateParameter"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Y2rR8MO1EeWVMJ0KdwVfSA" identifier="org.eclipse.papyrus.uml.ui.advice.TemplateParameter" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.internal.ui.advice.TemplateParameterEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClassifierTemplateParameter"/>
   </adviceBindingsConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/pom.xml
index 16681037c71..59834c8b5f2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types.ui/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.service.types.ui</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
index fc7d164d4b4..9cf925d949c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
@@ -13,13 +13,13 @@ Export-Package: org.eclipse.papyrus.uml.service.types,
 Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.uml2.uml.profile.standard;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.uml.types.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.types.core;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
  org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.100,2.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.1.100.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-Activator: org.eclipse.papyrus.uml.service.types.Activator
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations
index 534f7b94087..0fc649c1376 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/StandardProfile.elementtypesconfigurations
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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="_jfoLkGT_EeSEqNuV3JpFCA" identifier="org.eclipse.papyrus.uml.service.types.StandardProfile" name="StandardProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.stereotype.Trace" identifier="org.eclipse.papyrus.uml.stereotype.Trace" name="UML::Stereotype::Trace" hint="UML::Stereotype::Trace" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">
-    <eClass href="../../../plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Trace"/>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_jfoLkGT_EeSEqNuV3JpFCA" identifier="org.eclipse.papyrus.uml.service.types.StandardProfile" name="StandardProfile" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.stereotype.Trace" identifier="org.eclipse.papyrus.uml.stereotype.Trace" name="UML::Stereotype::Trace" hint="UML::Stereotype::Trace" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">
+    <eClass xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Trace"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.stereotype.Refine" identifier="org.eclipse.papyrus.uml.stereotype.Refine" name="UML::Stereotype::Refine" hint="UML::Stereotype::Refine" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">
-    <eClass href="../../../plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Refine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.stereotype.Refine" identifier="org.eclipse.papyrus.uml.stereotype.Refine" name="UML::Stereotype::Refine" hint="UML::Stereotype::Refine" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper">
+    <eClass xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore#//Refine"/>
   </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
index f755db0e357..8f46bf66ddd 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations
@@ -1,339 +1,339 @@
-<?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="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.uml.service.types.UMLContainmentsElementTypeSet" name="UMLContainmentsElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase" identifier="org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase" name="UML::UseCase_As_UML::Classifier::ownedUseCase" hint="UML::UseCase_As_UML::Classifier::ownedUseCase">
-    <iconEntry xmi:id="_SdLpwFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_g1eR0FuQEeSq2af_QYA1OA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UseCaseAsClassifierOwnedUseCaseEditHelperAdvice"/>
-    <containerConfiguration xmi:id="_SdLpwVYCEeS0WsAAtVmToA">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.uml.service.types.UMLContainmentsElementTypeSet" name="UMLContainmentsElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase" identifier="org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase" name="UML::UseCase_As_UML::Classifier::ownedUseCase" hint="UML::UseCase_As_UML::Classifier::ownedUseCase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdLpwFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_g1eR0FuQEeSq2af_QYA1OA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UseCaseAsClassifierOwnedUseCaseEditHelperAdvice"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_SdLpwVYCEeS0WsAAtVmToA">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier/ownedUseCase"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement" name="Constraint_As_UML::Package::packagedElement">
-    <iconEntry xmi:id="_m1srIJgmEeSbPLBxcMMcNg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_tgfvMJgmEeSbPLBxcMMcNg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement" name="Constraint_As_UML::Package::packagedElement" hint="" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_m1srIJgmEeSbPLBxcMMcNg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_tgfvMJgmEeSbPLBxcMMcNg">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement" identifier="org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement" name="UML::StringExpression_As_UML::Package::packagedElement" hint="UML::StringExpression_As_UML::Package::packagedElement">
-    <iconEntry xmi:id="_y2FL0L0dEeSA8oxr--Q4Aw" iconPath="/icons/full/obj16/StringExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_y2FL0r0dEeSA8oxr--Q4Aw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement" identifier="org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement" name="UML::StringExpression_As_UML::Package::packagedElement" hint="UML::StringExpression_As_UML::Package::packagedElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_y2FL0L0dEeSA8oxr--Q4Aw" iconPath="/icons/full/obj16/StringExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_y2FL0r0dEeSA8oxr--Q4Aw">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StringExpression"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StringExpression"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput" name="Expansion Node" hint="ExpansionNode_As_UML::ExpansionRegion::inputElement">
-    <iconEntry xmi:id="_Si-6ULocEeSsV_IrhqhBPw" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_xpxzMLocEeSsV_IrhqhBPw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion/inputElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput" name="Expansion Node" hint="ExpansionNode_As_UML::ExpansionRegion::inputElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Si-6ULocEeSsV_IrhqhBPw" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_xpxzMLocEeSsV_IrhqhBPw">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion/inputElement"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExpansionNode"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExpansionNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput" name="Expansion Node" hint="ExpansionNode_As_UML::ExpansionRegion::outputElement">
-    <iconEntry xmi:id="_4YwzsbocEeSsV_IrhqhBPw" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_4YwzsrocEeSsV_IrhqhBPw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion/outputElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput" identifier="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput" name="Expansion Node" hint="ExpansionNode_As_UML::ExpansionRegion::outputElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_4YwzsbocEeSsV_IrhqhBPw" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_4YwzsrocEeSsV_IrhqhBPw">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion/outputElement"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExpansionNode"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExpansionNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition" name="Constraint_As_Pre" hint="UML::Constraint_As_UML::Action::localPrecondition">
-    <iconEntry xmi:id="_4JcVAL6gEeSWor5pKcy9Fw" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_9i00gL6gEeSWor5pKcy9Fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition" name="Constraint_As_Pre" hint="UML::Constraint_As_UML::Action::localPrecondition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_4JcVAL6gEeSWor5pKcy9Fw" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_9i00gL6gEeSWor5pKcy9Fw">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPostcondition" name="Constraint_As_Post" hint="UML::Constraint_As_UML::Action::localPostcondition">
-    <iconEntry xmi:id="_7d_O8L6gEeSWor5pKcy9Fw" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_F9kzQL6hEeSWor5pKcy9Fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPostcondition" name="Constraint_As_Post" hint="UML::Constraint_As_UML::Action::localPostcondition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_7d_O8L6gEeSWor5pKcy9Fw" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_F9kzQL6hEeSWor5pKcy9Fw">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition" name="DurationConstraint_As_Pre" hint="UML::DurationConstraint_As_UML::Action::localPrecondition">
-    <iconEntry xmi:id="_cBmEEb6hEeSWor5pKcy9Fw" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_cBmEEr6hEeSWor5pKcy9Fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition" name="DurationConstraint_As_Pre" hint="UML::DurationConstraint_As_UML::Action::localPrecondition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_cBmEEb6hEeSWor5pKcy9Fw" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_cBmEEr6hEeSWor5pKcy9Fw">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPostcondition" name="DurationConstraint_As_Post" hint="UML::DurationConstraint_As_UML::Action::localPostcondition">
-    <iconEntry xmi:id="_51aSIL6hEeSWor5pKcy9Fw" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_cBmEFb6hEeSWor5pKcy9Fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPostcondition" name="DurationConstraint_As_Post" hint="UML::DurationConstraint_As_UML::Action::localPostcondition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_51aSIL6hEeSWor5pKcy9Fw" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_cBmEFb6hEeSWor5pKcy9Fw">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition" name="TimeConstraint_As_Pre" hint="UML::TimeConstraint_As_UML::Action::localPrecondition">
-    <iconEntry xmi:id="_wT89Mb9VEeSdDOiyPlc_Pg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_wT89Mr9VEeSdDOiyPlc_Pg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition" name="TimeConstraint_As_Pre" hint="UML::TimeConstraint_As_UML::Action::localPrecondition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_wT89Mb9VEeSdDOiyPlc_Pg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_wT89Mr9VEeSdDOiyPlc_Pg">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPostcondition" name="TimeConstraint_As_Post" hint="UML::TimeConstraint_As_UML::Action::localPostcondition">
-    <iconEntry xmi:id="_wT89NL9VEeSdDOiyPlc_Pg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_wT89Nb9VEeSdDOiyPlc_Pg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPostcondition" name="TimeConstraint_As_Post" hint="UML::TimeConstraint_As_UML::Action::localPostcondition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_wT89NL9VEeSdDOiyPlc_Pg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_wT89Nb9VEeSdDOiyPlc_Pg">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition" name="IntervalConstraint_As_Pre" hint="UML::IntervalConstraint_As_UML::Action::localPrecondition">
-    <iconEntry xmi:id="_iJLVAb9fEeSNNsF8trqP9g" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_iJLVAr9fEeSNNsF8trqP9g">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition" identifier="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition" name="IntervalConstraint_As_Pre" hint="UML::IntervalConstraint_As_UML::Action::localPrecondition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_iJLVAb9fEeSNNsF8trqP9g" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_iJLVAr9fEeSNNsF8trqP9g">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPrecondition"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPostcondition" name="IntervalConstraint_As_Post" hint="UML::IntervalConstraint_As_UML::Action::localPostcondition">
-    <iconEntry xmi:id="_iJLVBL9fEeSNNsF8trqP9g" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_iJLVBb9fEeSNNsF8trqP9g">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPostcondition" identifier="org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPostcondition" name="IntervalConstraint_As_Post" hint="UML::IntervalConstraint_As_UML::Action::localPostcondition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_iJLVBL9fEeSNNsF8trqP9g" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_iJLVBb9fEeSNNsF8trqP9g">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Action/localPostcondition"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement" identifier="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement" name="org.eclipse.papyrus.uml.Component_As_UML" hint="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement">
-    <containerConfiguration xmi:id="_yePr4NCrEeSPA6G9EAuxLg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Component/packagedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement" identifier="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement" name="org.eclipse.papyrus.uml.Component_As_UML" hint="org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_yePr4NCrEeSPA6G9EAuxLg">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component/packagedElement"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity" name="UML::Behavior_As_UML::State::doActivity" hint="UML::Behavior_As_UML::State::doActivity">
-    <iconEntry xmi:id="_5YbZsMwfEeSDe-jctQxSwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_KoAEEMwgEeSDe-jctQxSwg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//State/doActivity"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity" name="UML::Behavior_As_UML::State::doActivity" hint="UML::Behavior_As_UML::State::doActivity" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_5YbZsMwfEeSDe-jctQxSwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_KoAEEMwgEeSDe-jctQxSwg">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//State/doActivity"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior"/>
+    <specializedTypes xmi: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.uml.Behavior_As_UML::State::entry" description="" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::entry" name="UML::Behavior_As_UML::State::entry" hint="UML::Behavior_As_UML::State::entry">
-    <iconEntry xmi:id="_7S3GEcwfEeSDe-jctQxSwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_QapYIMwgEeSDe-jctQxSwg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//State/entry"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Behavior_As_UML::State::entry" description="" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::entry" name="UML::Behavior_As_UML::State::entry" hint="UML::Behavior_As_UML::State::entry" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_7S3GEcwfEeSDe-jctQxSwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_QapYIMwgEeSDe-jctQxSwg">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//State/entry"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior"/>
+    <specializedTypes xmi: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.uml.Behavior_As_UML::State::exit" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::exit" name="UML::Behavior_As_UML::State::exit" hint="UML::Behavior_As_UML::State::exit">
-    <iconEntry xmi:id="_7eFeocwfEeSDe-jctQxSwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_Q3yAEMwgEeSDe-jctQxSwg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//State/exit"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Behavior_As_UML::State::exit" identifier="org.eclipse.papyrus.uml.Behavior_As_UML::State::exit" name="UML::Behavior_As_UML::State::exit" hint="UML::Behavior_As_UML::State::exit" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_7eFeocwfEeSDe-jctQxSwg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_Q3yAEMwgEeSDe-jctQxSwg">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//State/exit"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior"/>
+    <specializedTypes xmi: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.uml.InputPin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::CallOperationAction::target" name="InputPin_As_CallOperationActionTarget" hint="UML::InputPin_As_UML::CallOperationAction::target">
-    <iconEntry xmi:id="_SFG_4NRlEeS91tsV_VS13w" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_40hagNRmEeSVOv5wRpe-fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::CallOperationAction::target" name="InputPin_As_CallOperationActionTarget" hint="UML::InputPin_As_UML::CallOperationAction::target" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SFG_4NRlEeS91tsV_VS13w" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_40hagNRmEeSVOv5wRpe-fw">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target" name="ActionInputPin_As_CallOperationActionTarget" hint="UML::ActionInputPin_As_UML::CallOperationAction::target">
-    <iconEntry xmi:id="_Sdx-kNRlEeS91tsV_VS13w" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_Ev5AUNRnEeSVOv5wRpe-fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target" name="ActionInputPin_As_CallOperationActionTarget" hint="UML::ActionInputPin_As_UML::CallOperationAction::target" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sdx-kNRlEeS91tsV_VS13w" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_Ev5AUNRnEeSVOv5wRpe-fw">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target" name="ValuePin_As_CallOperationActionTarget" hint="UML::ValuePin_As_UML::CallOperationAction::target">
-    <iconEntry xmi:id="_v7964dRlEeS91tsV_VS13w" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_E4Xm4NRnEeSVOv5wRpe-fw">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target" name="ValuePin_As_CallOperationActionTarget" hint="UML::ValuePin_As_UML::CallOperationAction::target" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_v7964dRlEeS91tsV_VS13w" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_E4Xm4NRnEeSVOv5wRpe-fw">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction/target"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object" name="InputPin_As_Object_In_SendObjectAction" hint="UML::InputPin_As_UML::SendObjectAction::object">
-    <iconEntry xmi:id="_U92jEdRvEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_U92jEtRvEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object" name="InputPin_As_Object_In_SendObjectAction" hint="UML::InputPin_As_UML::SendObjectAction::object" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_U92jEdRvEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_U92jEtRvEeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object" name="ActionInputPin_As_Object_In_SendObjectAction" hint="UML::ActionInputPin_As_UML::SendObjectAction::object">
-    <iconEntry xmi:id="_U92jFNRvEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_9SkuoNRwEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object" name="ActionInputPin_As_Object_In_SendObjectAction" hint="UML::ActionInputPin_As_UML::SendObjectAction::object" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_U92jFNRvEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_9SkuoNRwEeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object" name="ValuePin_As_Object_In_SendObjectAction" hint="UML::ValuePin_As_UML::SendObjectAction::object">
-    <iconEntry xmi:id="_U92jF9RvEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_9dAdANRwEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object" name="ValuePin_As_Object_In_SendObjectAction" hint="UML::ValuePin_As_UML::SendObjectAction::object" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_U92jF9RvEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_9dAdANRwEeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/request"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request" name="InputPin_As_Request_In_SendObjectAction" hint="UML::InputPin_As_UML::SendObjectAction::request">
-    <iconEntry xmi:id="_GS58IdRwEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_GS58ItRwEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request" name="InputPin_As_Request_In_SendObjectAction" hint="UML::InputPin_As_UML::SendObjectAction::request" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_GS58IdRwEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_GS58ItRwEeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request" name="ActionInputPin_As_Request_In_SendObjectAction" hint="UML::ActionInputPin_As_UML::SendObjectAction::request">
-    <iconEntry xmi:id="_GS58JNRwEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_GS58JdRwEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request" name="ActionInputPin_As_Request_In_SendObjectAction" hint="UML::ActionInputPin_As_UML::SendObjectAction::request" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_GS58JNRwEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_GS58JdRwEeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request" name="ValuePin_As_Request_In_SendObjectAction" hint="UML::ValuePin_As_UML::SendObjectAction::request">
-    <iconEntry xmi:id="_GS58J9RwEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_GS58KNRwEeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request" name="ValuePin_As_Request_In_SendObjectAction" hint="UML::ValuePin_As_UML::SendObjectAction::request" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_GS58J9RwEeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_GS58KNRwEeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction/target"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target" name="InputPin_As_Target_In_SendSignalAction" hint="UML::InputPin_As_UML::SendSignalAction::target">
-    <iconEntry xmi:id="_wAaYMdR0EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_wAaYMtR0EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target" name="InputPin_As_Target_In_SendSignalAction" hint="UML::InputPin_As_UML::SendSignalAction::target" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_wAaYMdR0EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_wAaYMtR0EeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target" name="ActionInputPin_As_Target_In_SendSignalAction" hint="UML::ActionInputPin_As_UML::SendSignalAction::target">
-    <iconEntry xmi:id="_wAaYNNR0EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_wAaYNdR0EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target" name="ActionInputPin_As_Target_In_SendSignalAction" hint="UML::ActionInputPin_As_UML::SendSignalAction::target" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_wAaYNNR0EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_wAaYNdR0EeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target" name="ValuePin_As_Target_In_SendSignalAction" hint="UML::ValuePin_As_UML::SendSignalAction::target">
-    <iconEntry xmi:id="_wAaYN9R0EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_wAaYONR0EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target" name="ValuePin_As_Target_In_SendSignalAction" hint="UML::ValuePin_As_UML::SendSignalAction::target" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_wAaYN9R0EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_wAaYONR0EeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction/target"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable" identifier="org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable" name="OutputPin_As_LoopNodeVariable_In_LoopNode" hint="UML::OutputPin_As_UML::LoopNode::loopNodeVariable">
-    <iconEntry xmi:id="_GVKk8dR7EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_GVKk8tR7EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//LoopNode/loopVariable"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable" identifier="org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable" name="OutputPin_As_LoopNodeVariable_In_LoopNode" hint="UML::OutputPin_As_UML::LoopNode::loopNodeVariable" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_GVKk8dR7EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_GVKk8tR7EeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//LoopNode/loopVariable"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt" name="InputPin_As_InsertAt_In_AddStructuralFeatureValueAction" hint="UML::InputPin_As_UML::AddStructuralFeatureValueAction::insertAt">
-    <iconEntry xmi:id="_UATp0dR8EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_9IsjcNR8EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt" name="InputPin_As_InsertAt_In_AddStructuralFeatureValueAction" hint="UML::InputPin_As_UML::AddStructuralFeatureValueAction::insertAt" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_UATp0dR8EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_9IsjcNR8EeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt" name="ActionInputPin_As_InsertAt_In_AddStructuralFeatureValueAction" hint="UML::ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt">
-    <iconEntry xmi:id="_UATp1NR8EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_VF8mwNR9EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt" name="ActionInputPin_As_InsertAt_In_AddStructuralFeatureValueAction" hint="UML::ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_UATp1NR8EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_VF8mwNR9EeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt" name="ValuePin_As_InsertAt_In_AddStructuralFeatureValueAction" hint="UML::ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt">
-    <iconEntry xmi:id="_UATp19R8EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_VXqo4NR9EeS2r-Rad2ICiQ">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt" name="ValuePin_As_InsertAt_In_AddStructuralFeatureValueAction" hint="UML::ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_UATp19R8EeS2r-Rad2ICiQ" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_VXqo4NR9EeS2r-Rad2ICiQ">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction/insertAt"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value" name="InputPin_As_Value_In_AddStructuralFeatureValueAction" hint="UML::InputPin_As_UML::AddStructuralFeatureValueAction::value">
-    <iconEntry xmi:id="_CEKbEdSBEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_CEKbEtSBEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value" name="InputPin_As_Value_In_AddStructuralFeatureValueAction" hint="UML::InputPin_As_UML::AddStructuralFeatureValueAction::value" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_CEKbEdSBEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_CEKbEtSBEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value" name="ActionInputPin_As_Value_In_AddStructuralFeatureValueAction" hint="UML::ActionInputPin_As_UML::AddStructuralFeatureValueAction::value">
-    <iconEntry xmi:id="_CEKbFNSBEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_CEKbFdSBEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value" name="ActionInputPin_As_Value_In_AddStructuralFeatureValueAction" hint="UML::ActionInputPin_As_UML::AddStructuralFeatureValueAction::value" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_CEKbFNSBEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_CEKbFdSBEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value" name="ValuePin_As_Value_In_AddStructuralFeatureValueAction" hint="UML::ValuePin_As_UML::AddStructuralFeatureValueAction::value">
-    <iconEntry xmi:id="_CEKbF9SBEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_CEKbGNSBEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value" name="ValuePin_As_Value_In_AddStructuralFeatureValueAction" hint="UML::ValuePin_As_UML::AddStructuralFeatureValueAction::value" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_CEKbF9SBEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_CEKbGNSBEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction/value"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt" name="InputPin_As_InsertAt_In_AddVariableValueAction" hint="UML::InputPin_As_UML::AddVariableValueAction::insertAt">
-    <iconEntry xmi:id="_NIgAUdSDEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_NIgAUtSDEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt" name="InputPin_As_InsertAt_In_AddVariableValueAction" hint="UML::InputPin_As_UML::AddVariableValueAction::insertAt" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_NIgAUdSDEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_NIgAUtSDEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt" name="ActionInputPin_As_InsertAt_In_AddVariableValueAction" hint="UML::ActionInputPin_As_UML::AddVariableValueAction::insertAt">
-    <iconEntry xmi:id="_NIgAVNSDEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_NIgAVdSDEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt" name="ActionInputPin_As_InsertAt_In_AddVariableValueAction" hint="UML::ActionInputPin_As_UML::AddVariableValueAction::insertAt" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_NIgAVNSDEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_NIgAVdSDEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt" name="ValuePin_As_InsertAt_In_AddVariableValueAction" hint="UML::ValuePin_As_UML::AddVariableValueAction::insertAt">
-    <iconEntry xmi:id="_NIgAV9SDEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_NIgAWNSDEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt" name="ValuePin_As_InsertAt_In_AddVariableValueAction" hint="UML::ValuePin_As_UML::AddVariableValueAction::insertAt" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_NIgAV9SDEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_NIgAWNSDEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction/insertAt"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object" name="InputPin_As_Object_In_StartObjectBehaviorAction" hint="UML::InputPin_As_UML::StartObjectBehaviorAction::object">
-    <iconEntry xmi:id="_78em8dSHEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_78em8tSHEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object" name="InputPin_As_Object_In_StartObjectBehaviorAction" hint="UML::InputPin_As_UML::StartObjectBehaviorAction::object" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_78em8dSHEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_78em8tSHEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object" name="ActionInputPin_As_Object_In_StartObjectBehaviorAction" hint="UML::ActionInputPin_As_UML::StartObjectBehaviorAction::object">
-    <iconEntry xmi:id="_78em9NSHEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_78em9dSHEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object" name="ActionInputPin_As_Object_In_StartObjectBehaviorAction" hint="UML::ActionInputPin_As_UML::StartObjectBehaviorAction::object" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_78em9NSHEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_78em9dSHEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object" name="ValuePin_As_Object_In_StartObjectBehaviorAction" hint="UML::ValuePin_As_UML::StartObjectBehaviorAction::object">
-    <iconEntry xmi:id="_78em99SHEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_78em-NSHEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object" name="ValuePin_As_Object_In_StartObjectBehaviorAction" hint="UML::ValuePin_As_UML::StartObjectBehaviorAction::object" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_78em99SHEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_78em-NSHEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction/object"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second" name="InputPin_As_Second_In_TestIdentityAction" hint="UML::InputPin_As_UML::TestIdentityAction::second">
-    <iconEntry xmi:id="_qGX2IdSJEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_qGX2ItSJEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second" name="InputPin_As_Second_In_TestIdentityAction" hint="UML::InputPin_As_UML::TestIdentityAction::second" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_qGX2IdSJEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_qGX2ItSJEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second" name="ActionInputPin_As_Second_In_TestIdentityAction" hint="UML::ActionInputPin_As_UML::TestIdentityAction::second">
-    <iconEntry xmi:id="_qGX2JNSJEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_qGX2JdSJEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second" name="ActionInputPin_As_Second_In_TestIdentityAction" hint="UML::ActionInputPin_As_UML::TestIdentityAction::second" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_qGX2JNSJEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_qGX2JdSJEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second" name="ValuePin_As_Second_In_TestIdentityAction" hint="UML::ValuePin_As_UML::TestIdentityAction::second">
-    <iconEntry xmi:id="_qGX2J9SJEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_qGX2KNSJEeSxgPgY51xQ1A">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second" identifier="org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second" name="ValuePin_As_Second_In_TestIdentityAction" hint="UML::ValuePin_As_UML::TestIdentityAction::second" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_qGX2J9SJEeSxgPgY51xQ1A" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_qGX2KNSJEeSxgPgY51xQ1A">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction/second"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.um.ExecutionEnvironment_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.ExecutionEnvironment_As_UML::Node::nestedNode" name="ExecutionEnvironment_As_NestedNode_In_Node" hint="UML::ExecutionEnvironment_As_UML::Node::nestedNode">
-    <iconEntry xmi:id="_8CDbAP_rEeSVDoeWScjgfg" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_875NEP_rEeSVDoeWScjgfg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.um.ExecutionEnvironment_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.ExecutionEnvironment_As_UML::Node::nestedNode" name="ExecutionEnvironment_As_NestedNode_In_Node" hint="UML::ExecutionEnvironment_As_UML::Node::nestedNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_8CDbAP_rEeSVDoeWScjgfg" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_875NEP_rEeSVDoeWScjgfg">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionEnvironment"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionEnvironment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.um.Device_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.Device_As_UML::Node::nestedNode" name="Device_As_NestedNode_In_Node" hint="UML::Device_As_UML::Node::nestedNode">
-    <iconEntry xmi:id="_2pe-YP_sEeSVDoeWScjgfg" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_2pe-Yf_sEeSVDoeWScjgfg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.um.Device_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.Device_As_UML::Node::nestedNode" name="Device_As_NestedNode_In_Node" hint="UML::Device_As_UML::Node::nestedNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_2pe-YP_sEeSVDoeWScjgfg" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_2pe-Yf_sEeSVDoeWScjgfg">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Device"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Device"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.um.Node_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.Node_As_UML::Node::nestedNode" name="Node_As_NestedNode_In_Node" hint="UML::Node_As_UML::Node::nestedNode">
-    <iconEntry xmi:id="_26IpgP_sEeSVDoeWScjgfg" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <containerConfiguration xmi:id="_26Ipgf_sEeSVDoeWScjgfg">
-      <eContainmentFeatures href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.um.Node_As_UML::Node::nestedNode" identifier="org.eclipse.papyrus.um.Node_As_UML::Node::nestedNode" name="Node_As_NestedNode_In_Node" hint="UML::Node_As_UML::Node::nestedNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_26IpgP_sEeSVDoeWScjgfg" iconPath="/icons/full/obj16/ExecutionEnviroment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <containerConfiguration xmi:type="elementtypesconfigurations:ContainerConfiguration" xmi:id="_26Ipgf_sEeSVDoeWScjgfg">
+      <eContainmentFeatures xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Node/nestedNode"/>
     </containerConfiguration>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Node"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Node"/>
   </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
index b48435ad8b1..6b6a08968c6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations
@@ -1,1176 +1,1158 @@
-<?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="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.uml.service.types.UMLElementTypeSet" name="UMLElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Abstraction" identifier="org.eclipse.papyrus.uml.Abstraction" name="UML::Abstraction" hint="UML::Abstraction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper">
-    <iconEntry xmi:id="_ScP1olYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Abstraction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AcceptCallAction" identifier="org.eclipse.papyrus.uml.AcceptCallAction" name="UML::AcceptCallAction" hint="UML::AcceptCallAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScQctFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AcceptCallAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AcceptCallAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AcceptEventAction" identifier="org.eclipse.papyrus.uml.AcceptEventAction" name="UML::AcceptEventAction" hint="UML::AcceptEventAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScQcvFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AcceptEventAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Action" identifier="org.eclipse.papyrus.uml.Action" name="UML::Action" hint="UML::Action" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScRDxVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Action.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Action"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionExecutionSpecification" identifier="org.eclipse.papyrus.uml.ActionExecutionSpecification" name="UML::ActionExecutionSpecification" hint="UML::ActionExecutionSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScRDx1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActionExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionExecutionSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin" identifier="org.eclipse.papyrus.uml.ActionInputPin" name="UML::ActionInputPin" hint="UML::ActionInputPin" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScRDyVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionInputPin"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Activity" identifier="org.eclipse.papyrus.uml.Activity" name="UML::Activity" hint="UML::Activity" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityHelper">
-    <iconEntry xmi:id="_ScTgHFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityContent" identifier="org.eclipse.papyrus.uml.ActivityContent" name="UML::ActivityContent" hint="UML::ActivityContent" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScTgHlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityContent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityContent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityEdge" identifier="org.eclipse.papyrus.uml.ActivityEdge" name="UML::ActivityEdge" hint="UML::ActivityEdge" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScTgIFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityEdge.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityEdge"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityFinalNode" identifier="org.eclipse.papyrus.uml.ActivityFinalNode" name="UML::ActivityFinalNode" hint="UML::ActivityFinalNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScTgIlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityFinalNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityGroup" identifier="org.eclipse.papyrus.uml.ActivityGroup" name="UML::ActivityGroup" hint="UML::ActivityGroup" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityGroupHelper">
-    <iconEntry xmi:id="_ScTgJFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityGroup.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityGroup"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityNode" identifier="org.eclipse.papyrus.uml.ActivityNode" name="UML::ActivityNode" hint="UML::ActivityNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScTgJlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityParameterNode" identifier="org.eclipse.papyrus.uml.ActivityParameterNode" name="UML::ActivityParameterNode" hint="UML::ActivityParameterNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScTgKFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityParameterNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityParameterNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityPartition" identifier="org.eclipse.papyrus.uml.ActivityPartition" name="UML::ActivityPartition" hint="UML::ActivityPartition" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityPartitionEditHelper">
-    <iconEntry xmi:id="_ScTgKlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityPartition"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Actor" identifier="org.eclipse.papyrus.uml.Actor" name="UML::Actor" hint="UML::Actor" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScV8UlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Actor"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AddStructuralFeatureValueAction" identifier="org.eclipse.papyrus.uml.AddStructuralFeatureValueAction" name="UML::AddStructuralFeatureValueAction" hint="UML::AddStructuralFeatureValueAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScWjVFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AddVariableValueAction" identifier="org.eclipse.papyrus.uml.AddVariableValueAction" name="UML::AddVariableValueAction" hint="UML::AddVariableValueAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScWjXFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AddVariableValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AnyReceiveEvent" identifier="org.eclipse.papyrus.uml.AnyReceiveEvent" name="UML::AnyReceiveEvent" hint="UML::AnyReceiveEvent" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScXKYVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AnyReceiveEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AnyReceiveEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Artifact" identifier="org.eclipse.papyrus.uml.Artifact" name="UML::Artifact" hint="UML::Artifact" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScXKaVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Artifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationBase" identifier="org.eclipse.papyrus.uml.AssociationBase" name="UML::AssociationBase" hint="UML::AssociationBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.AssociationBaseEditHelper">
-    <iconEntry xmi:id="_ScXxdVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Association"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Association" identifier="org.eclipse.papyrus.uml.Association" name="UML::Association" hint="UML::Association">
-    <iconEntry xmi:id="_vYYlEFYTEeSx49G4xBUj9Q" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_-lvgEFYTEeSx49G4xBUj9Q" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationNonDirected" identifier="org.eclipse.papyrus.uml.AssociationNonDirected" name="UML::AssociationNonDirected" hint="UML::AssociationNonDirected">
-    <iconEntry xmi:id="_Q_1woXhMEee4-vqumSjwzg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Q_1wonhMEee4-vqumSjwzg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice"/>
-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_Q_1wo3hMEee4-vqumSjwzg" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationDirected" identifier="org.eclipse.papyrus.uml.AssociationDirected" name="UML::AssociationDirected" hint="UML::AssociationDirected">
-    <iconEntry xmi:id="_Q2GJgRRZEeeYdIsxYO_sHQ" iconPath="/icons/Association_none_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Q2GJghRZEeeYdIsxYO_sHQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationDirectedEditHelperAdvice"/>
-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_Q2GJgxRZEeeYdIsxYO_sHQ" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationComposite" description="" identifier="org.eclipse.papyrus.uml.AssociationComposite" name="UML::AssociationComposite" hint="UML::AssociationComposite" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
-    <iconEntry xmi:id="_kCTAEROSEeeCzb3BUDUQ7g" iconPath="/icons/full/obj16/Association_composite.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_kCTAEhOSEeeCzb3BUDUQ7g" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationCompositeEditHelperAdvice"/>
-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_kCTAExOSEeeCzb3BUDUQ7g" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationCompositeDirected" description="" identifier="org.eclipse.papyrus.uml.AssociationCompositeDirected" name="UML::AssociationCompositeDirected" hint="UML::AssociationCompositeDirected" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
-    <iconEntry xmi:id="_Q2GJhRRZEeeYdIsxYO_sHQ" iconPath="/icons/Association_composite_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Q2GJhhRZEeeYdIsxYO_sHQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationCompositeDirectedEditHelperAdvice"/>
-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_Q2GJhxRZEeeYdIsxYO_sHQ" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationShared" description="" identifier="org.eclipse.papyrus.uml.AssociationShared" name="UML::AssociationShared" hint="UML::AssociationShared" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
-    <iconEntry xmi:id="_aZfn0RRYEeeYdIsxYO_sHQ" iconPath="/icons/full/obj16/Association_shared.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_aZfn0hRYEeeYdIsxYO_sHQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationSharedEditHelperAdvice"/>
-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_aZfn0xRYEeeYdIsxYO_sHQ" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationSharedDirected" description="" identifier="org.eclipse.papyrus.uml.AssociationSharedDirected" name="UML::AssociationSharedDirected" hint="UML::AssociationSharedDirected" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
-    <iconEntry xmi:id="_Q2GJiRRZEeeYdIsxYO_sHQ" iconPath="/icons/Association_shared_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Q2GJihRZEeeYdIsxYO_sHQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationSharedDirectedEditHelperAdvice"/>
-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_Q2GJixRZEeeYdIsxYO_sHQ" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationClassBase" identifier="org.eclipse.papyrus.uml.AssociationClassBase" name="UML::AssociationClassBase" hint="UML::AssociationClassBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.AssociationBaseEditHelper">
-    <iconEntry xmi:id="_ScXxd1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//AssociationClass"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationClass" identifier="org.eclipse.papyrus.uml.AssociationClass" name="UML::AssociationClass" hint="UML::AssociationClass">
-    <iconEntry xmi:id="_2Jg4EHV3EeScr8rbRObDkA" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_2Jg4EXV3EeScr8rbRObDkA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationClassBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Behavior" identifier="org.eclipse.papyrus.uml.Behavior" name="UML::Behavior" hint="UML::Behavior" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScaNsVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.BehaviorExecutionSpecification" identifier="org.eclipse.papyrus.uml.BehaviorExecutionSpecification" name="UML::BehaviorExecutionSpecification" hint="UML::BehaviorExecutionSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScaNs1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/BehaviorExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BehaviorExecutionSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.BehavioralFeature" identifier="org.eclipse.papyrus.uml.BehavioralFeature" name="UML::BehavioralFeature" hint="UML::BehavioralFeature" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScaNtVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/BehavioralFeature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.BehavioredClassifier" identifier="org.eclipse.papyrus.uml.BehavioredClassifier" name="UML::BehavioredClassifier" hint="UML::BehavioredClassifier" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.BehavioredClassifierEditHelper">
-    <iconEntry xmi:id="_ScaNt1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/BehavioredClassifier.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.BroadcastSignalAction" identifier="org.eclipse.papyrus.uml.BroadcastSignalAction" name="UML::BroadcastSignalAction" hint="UML::BroadcastSignalAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScaNuVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/BroadcastSignalAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//BroadcastSignalAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CallAction" identifier="org.eclipse.papyrus.uml.CallAction" name="UML::CallAction" hint="UML::CallAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScaNwVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CallAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CallBehaviorAction" identifier="org.eclipse.papyrus.uml.CallBehaviorAction" name="UML::CallBehaviorAction" hint="UML::CallBehaviorAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScaNw1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallBehaviorAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CallEvent" identifier="org.eclipse.papyrus.uml.CallEvent" name="UML::CallEvent" hint="UML::CallEvent" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScaNy1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CallOperationAction" identifier="org.eclipse.papyrus.uml.CallOperationAction" name="UML::CallOperationAction" hint="UML::CallOperationAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScaN01YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CentralBufferNode" identifier="org.eclipse.papyrus.uml.CentralBufferNode" name="UML::CentralBufferNode" hint="UML::CentralBufferNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScaN21YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CentralBufferNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CentralBufferNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ChangeEvent" identifier="org.eclipse.papyrus.uml.ChangeEvent" name="UML::ChangeEvent" hint="UML::ChangeEvent" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScaN3VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ChangeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ChangeEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Class" identifier="org.eclipse.papyrus.uml.Class" name="UML::Class" hint="UML::Class" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ClassEditHelper">
-    <iconEntry xmi:id="_Sca0wlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Classifier" identifier="org.eclipse.papyrus.uml.Classifier" name="UML::Classifier" hint="UML::Classifier" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sca00FYCEeS0WsAAtVmToA" iconPath="/icons/Classifier.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ClassifierTemplateParameterBase" identifier="org.eclipse.papyrus.uml.ClassifierTemplateParameterBase" name="UML::ClassifierTemplateParameterBase" hint="UML::ClassifierTemplateParameterBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sca00lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClassifierTemplateParameter"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ClassifierTemplateParameter" identifier="org.eclipse.papyrus.uml.ClassifierTemplateParameter" name="UML::ClassifierTemplateParameter" hint="UML::ClassifierTemplateParameter">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_uuHFoH67EeSVzvxdAiQ3xA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierTemplateParameterEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClassifierTemplateParameterBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Clause" identifier="org.eclipse.papyrus.uml.Clause" name="UML::Clause" hint="UML::Clause" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sca01FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Clause.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Clause"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ClearAssociationAction" identifier="org.eclipse.papyrus.uml.ClearAssociationAction" name="UML::ClearAssociationAction" hint="UML::ClearAssociationAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sca01lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ClearAssociationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearAssociationAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ClearStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.ClearStructuralFeatureAction" name="UML::ClearStructuralFeatureAction" hint="UML::ClearStructuralFeatureAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sca03lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearStructuralFeatureAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ClearVariableAction" identifier="org.eclipse.papyrus.uml.ClearVariableAction" name="UML::ClearVariableAction" hint="UML::ClearVariableAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sca05lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ClearVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearVariableAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Collaboration" identifier="org.eclipse.papyrus.uml.Collaboration" name="UML::Collaboration" hint="UML::Collaboration" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CollaborationEditHelper">
-    <iconEntry xmi:id="_Sca07lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Collaboration.CollaborationRole" identifier="org.eclipse.papyrus.uml.Collaboration.CollaborationRole" name="UML::Collaboration::CollaborationRole" hint="UML::Collaboration::CollaborationRole">
-    <iconEntry xmi:id="_XvNAUMc9EeS1POoqrCEMrQ" iconPath="/icons/full/obj16/ConnectableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_8m8kIMc9EeS1POoqrCEMrQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationCollaborationRoleEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.uml.service.types.UMLElementTypeSet" name="UMLElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Abstraction" identifier="org.eclipse.papyrus.uml.Abstraction" name="UML::Abstraction" hint="UML::Abstraction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScP1olYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Abstraction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AcceptCallAction" identifier="org.eclipse.papyrus.uml.AcceptCallAction" name="UML::AcceptCallAction" hint="UML::AcceptCallAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScQctFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AcceptCallAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//AcceptCallAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AcceptEventAction" identifier="org.eclipse.papyrus.uml.AcceptEventAction" name="UML::AcceptEventAction" hint="UML::AcceptEventAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScQcvFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//AcceptEventAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Action" identifier="org.eclipse.papyrus.uml.Action" name="UML::Action" hint="UML::Action" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScRDxVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Action.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Action"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionExecutionSpecification" identifier="org.eclipse.papyrus.uml.ActionExecutionSpecification" name="UML::ActionExecutionSpecification" hint="UML::ActionExecutionSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScRDx1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActionExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionExecutionSpecification"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActionInputPin" identifier="org.eclipse.papyrus.uml.ActionInputPin" name="UML::ActionInputPin" hint="UML::ActionInputPin" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScRDyVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ActionInputPin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Activity" identifier="org.eclipse.papyrus.uml.Activity" name="UML::Activity" hint="UML::Activity" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScTgHFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Activity"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityContent" identifier="org.eclipse.papyrus.uml.ActivityContent" name="UML::ActivityContent" hint="UML::ActivityContent" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScTgHlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityContent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityContent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityEdge" identifier="org.eclipse.papyrus.uml.ActivityEdge" name="UML::ActivityEdge" hint="UML::ActivityEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScTgIFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityEdge.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityEdge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityFinalNode" identifier="org.eclipse.papyrus.uml.ActivityFinalNode" name="UML::ActivityFinalNode" hint="UML::ActivityFinalNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScTgIlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityFinalNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityGroup" identifier="org.eclipse.papyrus.uml.ActivityGroup" name="UML::ActivityGroup" hint="UML::ActivityGroup" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityGroupHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScTgJFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityGroup.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityGroup"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityNode" identifier="org.eclipse.papyrus.uml.ActivityNode" name="UML::ActivityNode" hint="UML::ActivityNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScTgJlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityParameterNode" identifier="org.eclipse.papyrus.uml.ActivityParameterNode" name="UML::ActivityParameterNode" hint="UML::ActivityParameterNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScTgKFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityParameterNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityParameterNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ActivityPartition" identifier="org.eclipse.papyrus.uml.ActivityPartition" name="UML::ActivityPartition" hint="UML::ActivityPartition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityPartitionEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScTgKlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ActivityPartition"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Actor" identifier="org.eclipse.papyrus.uml.Actor" name="UML::Actor" hint="UML::Actor" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScV8UlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Actor"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AddStructuralFeatureValueAction" identifier="org.eclipse.papyrus.uml.AddStructuralFeatureValueAction" name="UML::AddStructuralFeatureValueAction" hint="UML::AddStructuralFeatureValueAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScWjVFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//AddStructuralFeatureValueAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AddVariableValueAction" identifier="org.eclipse.papyrus.uml.AddVariableValueAction" name="UML::AddVariableValueAction" hint="UML::AddVariableValueAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScWjXFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AddVariableValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//AddVariableValueAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AnyReceiveEvent" identifier="org.eclipse.papyrus.uml.AnyReceiveEvent" name="UML::AnyReceiveEvent" hint="UML::AnyReceiveEvent" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScXKYVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AnyReceiveEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//AnyReceiveEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Artifact" identifier="org.eclipse.papyrus.uml.Artifact" name="UML::Artifact" hint="UML::Artifact" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScXKaVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Artifact"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationBase" identifier="org.eclipse.papyrus.uml.AssociationBase" name="UML::AssociationBase" hint="UML::AssociationBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.AssociationBaseEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScXxdVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Association"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Association" identifier="org.eclipse.papyrus.uml.Association" name="UML::Association" hint="UML::Association" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_vYYlEFYTEeSx49G4xBUj9Q" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <matcherConfiguration xmi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_-lvgEFYTEeSx49G4xBUj9Q" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationNonDirected" identifier="org.eclipse.papyrus.uml.AssociationNonDirected" name="UML::AssociationNonDirected" hint="UML::AssociationNonDirected" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Q_1woXhMEee4-vqumSjwzg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Q_1wonhMEee4-vqumSjwzg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice"/>
+    <matcherConfiguration xmi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_Q_1wo3hMEee4-vqumSjwzg" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationDirected" identifier="org.eclipse.papyrus.uml.AssociationDirected" name="UML::AssociationDirected" hint="UML::AssociationDirected" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Q2GJgRRZEeeYdIsxYO_sHQ" iconPath="/icons/Association_none_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Q2GJghRZEeeYdIsxYO_sHQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationDirectedEditHelperAdvice"/>
+    <matcherConfiguration xmi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_Q2GJgxRZEeeYdIsxYO_sHQ" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationComposite" description="" identifier="org.eclipse.papyrus.uml.AssociationComposite" name="UML::AssociationComposite" hint="UML::AssociationComposite" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_kCTAEROSEeeCzb3BUDUQ7g" iconPath="/icons/full/obj16/Association_composite.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_kCTAEhOSEeeCzb3BUDUQ7g" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationCompositeEditHelperAdvice"/>
+    <matcherConfiguration xmi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_kCTAExOSEeeCzb3BUDUQ7g" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationCompositeDirected" description="" identifier="org.eclipse.papyrus.uml.AssociationCompositeDirected" name="UML::AssociationCompositeDirected" hint="UML::AssociationCompositeDirected" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Q2GJhRRZEeeYdIsxYO_sHQ" iconPath="/icons/Association_composite_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Q2GJhhRZEeeYdIsxYO_sHQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationCompositeDirectedEditHelperAdvice"/>
+    <matcherConfiguration xmi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_Q2GJhxRZEeeYdIsxYO_sHQ" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationShared" description="" identifier="org.eclipse.papyrus.uml.AssociationShared" name="UML::AssociationShared" hint="UML::AssociationShared" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_aZfn0RRYEeeYdIsxYO_sHQ" iconPath="/icons/full/obj16/Association_shared.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_aZfn0hRYEeeYdIsxYO_sHQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationSharedEditHelperAdvice"/>
+    <matcherConfiguration xmi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_aZfn0xRYEeeYdIsxYO_sHQ" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationSharedDirected" description="" identifier="org.eclipse.papyrus.uml.AssociationSharedDirected" name="UML::AssociationSharedDirected" hint="UML::AssociationSharedDirected" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.AssociationBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Q2GJiRRZEeeYdIsxYO_sHQ" iconPath="/icons/Association_shared_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Q2GJihRZEeeYdIsxYO_sHQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationSharedDirectedEditHelperAdvice"/>
+    <matcherConfiguration xmi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_Q2GJixRZEeeYdIsxYO_sHQ" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.AssociationMatcher"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationClassBase" identifier="org.eclipse.papyrus.uml.AssociationClassBase" name="UML::AssociationClassBase" hint="UML::AssociationClassBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.AssociationBaseEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScXxd1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//AssociationClass"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.AssociationClass" identifier="org.eclipse.papyrus.uml.AssociationClass" name="UML::AssociationClass" hint="UML::AssociationClass" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.AssociationClassBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_2Jg4EHV3EeScr8rbRObDkA" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_2Jg4EXV3EeScr8rbRObDkA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Behavior" identifier="org.eclipse.papyrus.uml.Behavior" name="UML::Behavior" hint="UML::Behavior" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaNsVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.BehaviorExecutionSpecification" identifier="org.eclipse.papyrus.uml.BehaviorExecutionSpecification" name="UML::BehaviorExecutionSpecification" hint="UML::BehaviorExecutionSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaNs1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/BehaviorExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehaviorExecutionSpecification"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.BehavioralFeature" identifier="org.eclipse.papyrus.uml.BehavioralFeature" name="UML::BehavioralFeature" hint="UML::BehavioralFeature" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaNtVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/BehavioralFeature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.BehavioredClassifier" identifier="org.eclipse.papyrus.uml.BehavioredClassifier" name="UML::BehavioredClassifier" hint="UML::BehavioredClassifier" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.BehavioredClassifierEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaNt1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/BehavioredClassifier.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioredClassifier"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.BroadcastSignalAction" identifier="org.eclipse.papyrus.uml.BroadcastSignalAction" name="UML::BroadcastSignalAction" hint="UML::BroadcastSignalAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaNuVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/BroadcastSignalAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BroadcastSignalAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CallAction" identifier="org.eclipse.papyrus.uml.CallAction" name="UML::CallAction" hint="UML::CallAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaNwVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CallAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CallBehaviorAction" identifier="org.eclipse.papyrus.uml.CallBehaviorAction" name="UML::CallBehaviorAction" hint="UML::CallBehaviorAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaNw1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallBehaviorAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CallEvent" identifier="org.eclipse.papyrus.uml.CallEvent" name="UML::CallEvent" hint="UML::CallEvent" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaNy1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CallOperationAction" identifier="org.eclipse.papyrus.uml.CallOperationAction" name="UML::CallOperationAction" hint="UML::CallOperationAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaN01YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CallOperationAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CentralBufferNode" identifier="org.eclipse.papyrus.uml.CentralBufferNode" name="UML::CentralBufferNode" hint="UML::CentralBufferNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaN21YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CentralBufferNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CentralBufferNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ChangeEvent" identifier="org.eclipse.papyrus.uml.ChangeEvent" name="UML::ChangeEvent" hint="UML::ChangeEvent" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScaN3VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ChangeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ChangeEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Class" identifier="org.eclipse.papyrus.uml.Class" name="UML::Class" hint="UML::Class" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ClassEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sca0wlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Classifier" identifier="org.eclipse.papyrus.uml.Classifier" name="UML::Classifier" hint="UML::Classifier" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sca00FYCEeS0WsAAtVmToA" iconPath="/icons/Classifier.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ClassifierTemplateParameterBase" identifier="org.eclipse.papyrus.uml.ClassifierTemplateParameterBase" name="UML::ClassifierTemplateParameterBase" hint="UML::ClassifierTemplateParameterBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sca00lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ClassifierTemplateParameter"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ClassifierTemplateParameter" identifier="org.eclipse.papyrus.uml.ClassifierTemplateParameter" name="UML::ClassifierTemplateParameter" hint="UML::ClassifierTemplateParameter" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.ClassifierTemplateParameterBase">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_uuHFoH67EeSVzvxdAiQ3xA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierTemplateParameterEditHelperAdvice"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Clause" identifier="org.eclipse.papyrus.uml.Clause" name="UML::Clause" hint="UML::Clause" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sca01FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Clause.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Clause"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ClearAssociationAction" identifier="org.eclipse.papyrus.uml.ClearAssociationAction" name="UML::ClearAssociationAction" hint="UML::ClearAssociationAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sca01lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ClearAssociationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearAssociationAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CollaborationUse" identifier="org.eclipse.papyrus.uml.CollaborationUse" name="UML::CollaborationUse" hint="UML::CollaborationUse" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sca08FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CollaborationUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CollaborationUse"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ClearStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.ClearStructuralFeatureAction" name="UML::ClearStructuralFeatureAction" hint="UML::ClearStructuralFeatureAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sca03lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearStructuralFeatureAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CombinedFragment" identifier="org.eclipse.papyrus.uml.CombinedFragment" name="UML::CombinedFragment" hint="UML::CombinedFragment" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CombinedFragmentEditHelper">
-    <iconEntry xmi:id="_Scbb11YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CombinedFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CombinedFragment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ClearVariableAction" identifier="org.eclipse.papyrus.uml.ClearVariableAction" name="UML::ClearVariableAction" hint="UML::ClearVariableAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sca05lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ClearVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ClearVariableAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Comment" identifier="org.eclipse.papyrus.uml.Comment" name="UML::Comment" hint="UML::Comment" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scbb2VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Collaboration" identifier="org.eclipse.papyrus.uml.Collaboration" name="UML::Collaboration" hint="UML::Collaboration" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CollaborationEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sca07lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Collaboration"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Comment.AnnotatedElements" identifier="org.eclipse.papyrus.uml.Comment.AnnotatedElements" name="UML::Comment::AnnotatedElements" hint="UML::Comment::AnnotatedElements">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_6-K50HY7EeSaAZaF2vKiqg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CommunicationPath" identifier="org.eclipse.papyrus.uml.CommunicationPath" name="UML::CommunicationPath" hint="UML::CommunicationPath" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CommunicationPathEditHelper">
-    <iconEntry xmi:id="_Scbb21YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CommunicationPath.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CommunicationPath"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Component" identifier="org.eclipse.papyrus.uml.Component" name="UML::Component" hint="UML::Component" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ComponentEditHelper">
-    <iconEntry xmi:id="_Scbb6VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ComponentRealization" identifier="org.eclipse.papyrus.uml.ComponentRealization" name="UML::ComponentRealization" hint="UML::ComponentRealization" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ComponentRealizationEditHelper">
-    <iconEntry xmi:id="_Scbb61YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ComponentRealization"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConditionalNode" identifier="org.eclipse.papyrus.uml.ConditionalNode" name="UML::ConditionalNode" hint="UML::ConditionalNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper">
-    <iconEntry xmi:id="_ScbcBVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConditionalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConditionalNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConnectableElement" identifier="org.eclipse.papyrus.uml.ConnectableElement" name="UML::ConnectableElement" hint="UML::ConnectableElement" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SccC8FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConnectableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectableElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConnectableElementTemplateParameterBase" identifier="org.eclipse.papyrus.uml.ConnectableElementTemplateParameterBase" name="UML::ConnectableElementTemplateParameterBase" hint="UML::ConnectableElementTemplateParameterBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SccC8lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectableElementTemplateParameter"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter" identifier="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter" name="UML::ConnectableElementTemplateParameter" hint="UML::ConnectableElementTemplateParameter">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_yjhpkZXIEeSmV5hdT3HeBw" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectableElementTemplateParameterEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConnectableElementTemplateParameterBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConnectionPointReference" identifier="org.eclipse.papyrus.uml.ConnectionPointReference" name="UML::ConnectionPointReference" hint="UML::ConnectionPointReference" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SccC9FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConnectionPointReference.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectionPointReference"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Connector" identifier="org.eclipse.papyrus.uml.Connector" name="UML::Connector" hint="UML::Connector" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ConnectorEditHelper">
-    <iconEntry xmi:id="_SccC9lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConnectorEnd" identifier="org.eclipse.papyrus.uml.ConnectorEnd" name="UML::ConnectorEnd" hint="UML::ConnectorEnd" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SccC-FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConnectorEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectorEnd"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConsiderIgnoreFragment" identifier="org.eclipse.papyrus.uml.ConsiderIgnoreFragment" name="UML::ConsiderIgnoreFragment" hint="UML::ConsiderIgnoreFragment" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SccC-lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConsiderIgnoreFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ConsiderIgnoreFragment"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint" identifier="org.eclipse.papyrus.uml.Constraint" name="UML::Constraint" hint="UML::Constraint" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ConstraintEditHelper">
-    <iconEntry xmi:id="_SccC_FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint.ConstrainedElements" identifier="org.eclipse.papyrus.uml.Constraint.ConstrainedElements" name="UML::Constraint::ConstrainedElements" hint="UML::Constraint::ConstrainedElements">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_njRJoHbmEeSsxehP964iKQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint.Context" identifier="org.eclipse.papyrus.uml.Constraint.Context" name="UML::Constraint::Context" hint="UML::Constraint::Context">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_rZSY8HbmEeSsxehP964iKQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Continuation" identifier="org.eclipse.papyrus.uml.Continuation" name="UML::Continuation" hint="UML::Continuation" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SccDFlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Continuation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Continuation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ControlFlow" identifier="org.eclipse.papyrus.uml.ControlFlow" name="UML::ControlFlow" hint="UML::ControlFlow" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ControlFlowEditHelper">
-    <iconEntry xmi:id="_SccDGFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ControlFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ControlFlow"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ControlNode" identifier="org.eclipse.papyrus.uml.ControlNode" name="UML::ControlNode" hint="UML::ControlNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sccp8FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ControlNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ControlNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CreateLinkAction" identifier="org.eclipse.papyrus.uml.CreateLinkAction" name="UML::CreateLinkAction" hint="UML::CreateLinkAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sccp8lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CreateLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateLinkAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CreateLinkObjectAction" identifier="org.eclipse.papyrus.uml.CreateLinkObjectAction" name="UML::CreateLinkObjectAction" hint="UML::CreateLinkObjectAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sccp-lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateLinkObjectAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CreateObjectAction" identifier="org.eclipse.papyrus.uml.CreateObjectAction" name="UML::CreateObjectAction" hint="UML::CreateObjectAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SccqAlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CreateObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateObjectAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DataStoreNode" identifier="org.eclipse.papyrus.uml.DataStoreNode" name="UML::DataStoreNode" hint="UML::DataStoreNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SccqClYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DataStoreNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DataStoreNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Collaboration.CollaborationRole" identifier="org.eclipse.papyrus.uml.Collaboration.CollaborationRole" name="UML::Collaboration::CollaborationRole" hint="UML::Collaboration::CollaborationRole" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_XvNAUMc9EeS1POoqrCEMrQ" iconPath="/icons/full/obj16/ConnectableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_8m8kIMc9EeS1POoqrCEMrQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationCollaborationRoleEditHelperAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DataType" identifier="org.eclipse.papyrus.uml.DataType" name="UML::DataType" hint="UML::DataType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SccqDFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CollaborationUse" identifier="org.eclipse.papyrus.uml.CollaborationUse" name="UML::CollaborationUse" hint="UML::CollaborationUse" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sca08FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CollaborationUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CollaborationUse"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DecisionNode" identifier="org.eclipse.papyrus.uml.DecisionNode" name="UML::DecisionNode" hint="UML::DecisionNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SccqGlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DecisionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DecisionNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CombinedFragment" identifier="org.eclipse.papyrus.uml.CombinedFragment" name="UML::CombinedFragment" hint="UML::CombinedFragment" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CombinedFragmentEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scbb11YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CombinedFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CombinedFragment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Dependency" identifier="org.eclipse.papyrus.uml.Dependency" name="UML::Dependency" hint="UML::Dependency" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper">
-    <iconEntry xmi:id="_SccqHFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Comment" identifier="org.eclipse.papyrus.uml.Comment" name="UML::Comment" hint="UML::Comment" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scbb2VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Comment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CollaborationUse.RoleBinding" identifier="org.eclipse.papyrus.uml.CollaborationUse.RoleBinding" name="UML::CollaborationUse::RoleBinding" hint="UML::CollaborationUse::RoleBinding">
-    <iconEntry xmi:id="_m8FswLhAEeSANYuUIb1qQA" iconPath="/icons/CollaborationRoleBinding.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Ao6QQLhBEeSANYuUIb1qQA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.RoleBindingHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DeployedArtifact" identifier="org.eclipse.papyrus.uml.DeployedArtifact" name="UML::DeployedArtifact" hint="UML::DeployedArtifact" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SccqJFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DeployedArtifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DeployedArtifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Deployment" identifier="org.eclipse.papyrus.uml.Deployment" name="UML::Deployment" hint="UML::Deployment" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DeploymentEditHelper">
-    <iconEntry xmi:id="_SccqJlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Deployment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Deployment"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DeploymentSpecification" identifier="org.eclipse.papyrus.uml.DeploymentSpecification" name="UML::DeploymentSpecification" hint="UML::DeploymentSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScdRAVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DeploymentTarget" identifier="org.eclipse.papyrus.uml.DeploymentTarget" name="UML::DeploymentTarget" hint="UML::DeploymentTarget" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScdRD1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DeploymentTarget.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentTarget"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DestroyLinkAction" identifier="org.eclipse.papyrus.uml.DestroyLinkAction" name="UML::DestroyLinkAction" hint="UML::DestroyLinkAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScdRF1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DestroyLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DestroyLinkAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DestroyObjectAction" identifier="org.eclipse.papyrus.uml.DestroyObjectAction" name="UML::DestroyObjectAction" hint="UML::DestroyObjectAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScdRH1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DestroyObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DestroyObjectAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DestructionOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.DestructionOccurrenceSpecification" name="UML::DestructionOccurrenceSpecification" hint="UML::DestructionOccurrenceSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScdRJ1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DestructionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DestructionOccurrenceSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Device" identifier="org.eclipse.papyrus.uml.Device" name="UML::Device" hint="UML::Device" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScdRKVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Device"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DirectedRelationship" identifier="org.eclipse.papyrus.uml.DirectedRelationship" name="UML::DirectedRelationship" hint="UML::DirectedRelationship" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scd4FFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DirectedRelationship.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Duration" identifier="org.eclipse.papyrus.uml.Duration" name="UML::Duration" hint="UML::Duration" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scd4FlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Duration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Duration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationConstraint" identifier="org.eclipse.papyrus.uml.DurationConstraint" name="UML::DurationConstraint" hint="UML::DurationConstraint" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DurationConstraintEditHelper">
-    <iconEntry xmi:id="_Scd4GFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationConstraint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationInterval" identifier="org.eclipse.papyrus.uml.DurationInterval" name="UML::DurationInterval" hint="UML::DurationInterval" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scd4MlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DurationInterval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationInterval"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationObservation" identifier="org.eclipse.papyrus.uml.DurationObservation" name="UML::DurationObservation" hint="UML::DurationObservation" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ObservationEditHelper">
-    <iconEntry xmi:id="_ScefS1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationObservation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationObservation.Event" identifier="org.eclipse.papyrus.uml.DurationObservation.Event" name="UML::DurationObservation::Event" hint="UML::DurationObservation::Event">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_y8N2UFWsEeeGFsmbOwBrhg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.DurationObservationEventEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Element" identifier="org.eclipse.papyrus.uml.Element" name="UML::Element" hint="UML::Element" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScgUUVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ElementImportBase" identifier="org.eclipse.papyrus.uml.ElementImportBase" name="UML::ElementImportBase" hint="UML::ElementImportBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementImportEditHelper">
-    <iconEntry xmi:id="_ScgUU1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ElementImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ElementImport"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ElementImport" identifier="org.eclipse.papyrus.uml.ElementImport" name="UML::ElementImport" hint="UML::ElementImport">
-    <iconEntry xmi:id="_H_ygYAOyEeWv4ca2-olBmg" iconPath="/icons/full/obj16/ElementImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_TB2dEJzPEeSEObywEoz_Cw" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementImportEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ElementImportBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.EncapsulatedClassifier" identifier="org.eclipse.papyrus.uml.EncapsulatedClassifier" name="UML::EncapsulatedClassifier" hint="UML::EncapsulatedClassifier" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScgUVVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/EncapsulatedClassifier.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Enumeration" identifier="org.eclipse.papyrus.uml.Enumeration" name="UML::Enumeration" hint="UML::Enumeration" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.EnumerationEditHelper">
-    <iconEntry xmi:id="_ScgUV1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.EnumerationLiteral" identifier="org.eclipse.papyrus.uml.EnumerationLiteral" name="UML::EnumerationLiteral" hint="UML::EnumerationLiteral" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScgUWVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Event" identifier="org.eclipse.papyrus.uml.Event" name="UML::Event" hint="UML::Event" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scg7ZVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Event"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExceptionHandler" identifier="org.eclipse.papyrus.uml.ExceptionHandler" name="UML::ExceptionHandler" hint="UML::ExceptionHandler" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExceptionHandlerEditHelper">
-    <iconEntry xmi:id="_Scg7Z1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExceptionHandler.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExceptionHandler"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExecutableNode" identifier="org.eclipse.papyrus.uml.ExecutableNode" name="UML::ExecutableNode" hint="UML::ExecutableNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Scg7aVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExecutableNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutableNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExecutionEnvironment" identifier="org.eclipse.papyrus.uml.ExecutionEnvironment" name="UML::ExecutionEnvironment" hint="UML::ExecutionEnvironment" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scg7a1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionEnvironment"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification" name="UML::ExecutionOccurrenceSpecification" hint="UML::ExecutionOccurrenceSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SchiclYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExecutionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionOccurrenceSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExecutionSpecification" identifier="org.eclipse.papyrus.uml.ExecutionSpecification" name="UML::ExecutionSpecification" hint="UML::ExecutionSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SchidFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExpansionNode" identifier="org.eclipse.papyrus.uml.ExpansionNode" name="UML::ExpansionNode" hint="UML::ExpansionNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExpansionNodeHelper">
-    <iconEntry xmi:id="_SchidlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExpansionRegion" identifier="org.eclipse.papyrus.uml.ExpansionRegion" name="UML::ExpansionRegion" hint="UML::ExpansionRegion" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExpansionRegionHelper">
-    <iconEntry xmi:id="_SchieFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExpansionRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Expression" identifier="org.eclipse.papyrus.uml.Expression" name="UML::Expression" hint="UML::Expression" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SchiiVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Expression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Expression"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExtendBase" identifier="org.eclipse.papyrus.uml.ExtendBase" name="UML::ExtendBase" hint="UML::ExtendBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExtendEditHelper">
-    <iconEntry xmi:id="_ScjXoFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Extend.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Extend"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Extend" identifier="org.eclipse.papyrus.uml.Extend" name="UML::Extend" hint="UML::Extend">
-    <iconEntry xmi:id="_t3ycMFrNEeSNSq3G9Z6fKQ" iconPath="/icons/full/obj16/Extend.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_8QiDYFrNEeSNSq3G9Z6fKQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ExtendEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtendBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Extension" identifier="org.eclipse.papyrus.uml.Extension" name="UML::Extension" hint="UML::Extension" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExtensionEditHelper">
-    <iconEntry xmi:id="_ScjXolYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Extension.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Extension"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExtensionEnd" identifier="org.eclipse.papyrus.uml.ExtensionEnd" name="UML::ExtensionEnd" hint="UML::ExtensionEnd" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScjXpFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExtensionEnd"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExtensionPoint" identifier="org.eclipse.papyrus.uml.ExtensionPoint" name="UML::ExtensionPoint" hint="UML::ExtensionPoint" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScjXrFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ExtensionPoint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Feature" identifier="org.eclipse.papyrus.uml.Feature" name="UML::Feature" hint="UML::Feature" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScjXulYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Feature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FinalNode" identifier="org.eclipse.papyrus.uml.FinalNode" name="UML::FinalNode" hint="UML::FinalNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Scj-sVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/FinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FinalNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FinalState" identifier="org.eclipse.papyrus.uml.FinalState" name="UML::FinalState" hint="UML::FinalState" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScklwFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/FinalState.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FinalState"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FlowFinalNode" identifier="org.eclipse.papyrus.uml.FlowFinalNode" name="UML::FlowFinalNode" hint="UML::FlowFinalNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScklwlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FlowFinalNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ForkNode" identifier="org.eclipse.papyrus.uml.ForkNode" name="UML::ForkNode" hint="UML::ForkNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_ScklxFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ForkNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FunctionBehavior" identifier="org.eclipse.papyrus.uml.FunctionBehavior" name="UML::FunctionBehavior" hint="UML::FunctionBehavior" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScklxlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//FunctionBehavior"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Gate" identifier="org.eclipse.papyrus.uml.Gate" name="UML::Gate" hint="UML::Gate" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sclz61YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Gate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Gate"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.GeneralOrdering" identifier="org.eclipse.papyrus.uml.GeneralOrdering" name="UML::GeneralOrdering" hint="UML::GeneralOrdering" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sclz7VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/GeneralOrdering.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralOrdering"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Generalization" identifier="org.eclipse.papyrus.uml.Generalization" name="UML::Generalization" hint="UML::Generalization" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.GeneralizationEditHelper">
-    <iconEntry xmi:id="_Scma8VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Generalization"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.GeneralizationSet" identifier="org.eclipse.papyrus.uml.GeneralizationSet" name="UML::GeneralizationSet" hint="UML::GeneralizationSet" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.GeneralizationSetEditHelper">
-    <iconEntry xmi:id="_ScnCAVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/GeneralizationSet.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralizationSet"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Image" identifier="org.eclipse.papyrus.uml.Image" name="UML::Image" hint="UML::Image" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScnCCVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Image.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Image"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Include" identifier="org.eclipse.papyrus.uml.Include" name="UML::Include" hint="UML::Include" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.IncludeEditHelper">
-    <iconEntry xmi:id="_ScnCC1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Include.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Include"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InformationFlowBase" identifier="org.eclipse.papyrus.uml.InformationFlowBase" name="UML::InformationFlowBase" hint="UML::InformationFlowBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InformationFlowEditHelper">
-    <iconEntry xmi:id="_ScnCDVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InformationFlow"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InformationFlow" identifier="org.eclipse.papyrus.uml.InformationFlow" name="UML::InformationFlow" hint="UML::InformationFlow">
-    <iconEntry xmi:id="_jt-DYLgeEeSANYuUIb1qQA" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_lfPMsLgeEeSANYuUIb1qQA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InformationFlowEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationFlowBase"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Comment.AnnotatedElements" identifier="org.eclipse.papyrus.uml.Comment.AnnotatedElements" name="UML::Comment::AnnotatedElements" hint="UML::Comment::AnnotatedElements" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_6-K50HY7EeSaAZaF2vKiqg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsEditHelperAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InformationItem" identifier="org.eclipse.papyrus.uml.InformationItem" name="UML::InformationItem" hint="UML::InformationItem" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScnCFVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InformationItem"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CommunicationPath" identifier="org.eclipse.papyrus.uml.CommunicationPath" name="UML::CommunicationPath" hint="UML::CommunicationPath" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.CommunicationPathEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scbb21YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CommunicationPath.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CommunicationPath"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InitialNode" identifier="org.eclipse.papyrus.uml.InitialNode" name="UML::InitialNode" hint="UML::InitialNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sco3OlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InitialNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Component" identifier="org.eclipse.papyrus.uml.Component" name="UML::Component" hint="UML::Component" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ComponentEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scbb6VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Component"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin" identifier="org.eclipse.papyrus.uml.InputPin" name="UML::InputPin" hint="UML::InputPin" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sco3PFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ComponentRealization" identifier="org.eclipse.papyrus.uml.ComponentRealization" name="UML::ComponentRealization" hint="UML::ComponentRealization" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ComponentRealizationEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scbb61YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ComponentRealization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InstanceSpecification" identifier="org.eclipse.papyrus.uml.InstanceSpecification" name="UML::InstanceSpecification" hint="UML::InstanceSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InstanceSpecificationEditHelper">
-    <iconEntry xmi:id="_Scr6ilYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InstanceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConditionalNode" identifier="org.eclipse.papyrus.uml.ConditionalNode" name="UML::ConditionalNode" hint="UML::ConditionalNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScbcBVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConditionalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ConditionalNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InstanceSpecification.Link" identifier="org.eclipse.papyrus.uml.InstanceSpecification.Link" name="UML::InstanceSpecification::Link" hint="UML::InstanceSpecification::Link">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_bvHrYZXNEeSmV5hdT3HeBw" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InstanceSpecificationEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConnectableElement" identifier="org.eclipse.papyrus.uml.ConnectableElement" name="UML::ConnectableElement" hint="UML::ConnectableElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccC8FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConnectableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectableElement"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InstanceValue" identifier="org.eclipse.papyrus.uml.InstanceValue" name="UML::InstanceValue" hint="UML::InstanceValue" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scr6klYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InstanceValue.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InstanceValue"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConnectableElementTemplateParameterBase" identifier="org.eclipse.papyrus.uml.ConnectableElementTemplateParameterBase" name="UML::ConnectableElementTemplateParameterBase" hint="UML::ConnectableElementTemplateParameterBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccC8lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectableElementTemplateParameter"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Interaction" identifier="org.eclipse.papyrus.uml.Interaction" name="UML::Interaction" hint="UML::Interaction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InteractionEditHelper">
-    <iconEntry xmi:id="_SctIslYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter" identifier="org.eclipse.papyrus.uml.ConnectableElementTemplateParameter" name="UML::ConnectableElementTemplateParameter" hint="UML::ConnectableElementTemplateParameter" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.ConnectableElementTemplateParameterBase">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_yjhpkZXIEeSmV5hdT3HeBw" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectableElementTemplateParameterEditHelperAdvice"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InteractionConstraint" identifier="org.eclipse.papyrus.uml.InteractionConstraint" name="UML::InteractionConstraint" hint="UML::InteractionConstraint" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SctItFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InteractionConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConnectionPointReference" identifier="org.eclipse.papyrus.uml.ConnectionPointReference" name="UML::ConnectionPointReference" hint="UML::ConnectionPointReference" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccC9FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConnectionPointReference.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectionPointReference"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InteractionFragment" identifier="org.eclipse.papyrus.uml.InteractionFragment" name="UML::InteractionFragment" hint="UML::InteractionFragment" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sctvw1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InteractionFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionFragment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Connector" identifier="org.eclipse.papyrus.uml.Connector" name="UML::Connector" hint="UML::Connector" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ConnectorEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccC9lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Connector"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InteractionOperand" identifier="org.eclipse.papyrus.uml.InteractionOperand" name="UML::InteractionOperand" hint="UML::InteractionOperand" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InteractionOperandEditHelper">
-    <iconEntry xmi:id="_SctvxVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InteractionOperand.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionOperand"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InteractionUse" identifier="org.eclipse.papyrus.uml.InteractionUse" name="UML::InteractionUse" hint="UML::InteractionUse" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sctvx1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InteractionUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionUse"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Interface" identifier="org.eclipse.papyrus.uml.Interface" name="UML::Interface" hint="UML::Interface" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScuW2lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InterfaceRealization" identifier="org.eclipse.papyrus.uml.InterfaceRealization" name="UML::InterfaceRealization" hint="UML::InterfaceRealization" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InterfaceRealizationEditHelper">
-    <iconEntry xmi:id="_Scvk4FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InterfaceRealization"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InterruptibleActivityRegion" identifier="org.eclipse.papyrus.uml.InterruptibleActivityRegion" name="UML::InterruptibleActivityRegion" hint="UML::InterruptibleActivityRegion" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InterruptibleActivityRegionHelper">
-    <iconEntry xmi:id="_ScwL-lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InterruptibleActivityRegion"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Interval" identifier="org.eclipse.papyrus.uml.Interval" name="UML::Interval" hint="UML::Interval" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_ScwL_FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Interval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Interval"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.IntervalConstraint" identifier="org.eclipse.papyrus.uml.IntervalConstraint" name="UML::IntervalConstraint" hint="UML::IntervalConstraint" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.IntervalConstraintEditHelper">
-    <iconEntry xmi:id="_ScxaEVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//IntervalConstraint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InvocationAction" identifier="org.eclipse.papyrus.uml.InvocationAction" name="UML::InvocationAction" hint="UML::InvocationAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Scz2VFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InvocationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//InvocationAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.JoinNode" identifier="org.eclipse.papyrus.uml.JoinNode" name="UML::JoinNode" hint="UML::JoinNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Scz2VlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//JoinNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Lifeline" identifier="org.eclipse.papyrus.uml.Lifeline" name="UML::Lifeline" hint="UML::Lifeline" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.LifelineEditHelper">
-    <iconEntry xmi:id="_Scz2WFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Lifeline.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Lifeline"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LinkAction" identifier="org.eclipse.papyrus.uml.LinkAction" name="UML::LinkAction" hint="UML::LinkAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Scz2WlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LinkEndCreationData" identifier="org.eclipse.papyrus.uml.LinkEndCreationData" name="UML::LinkEndCreationData" hint="UML::LinkEndCreationData" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scz2XFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LinkEndCreationData.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndCreationData"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LinkEndData" identifier="org.eclipse.papyrus.uml.LinkEndData" name="UML::LinkEndData" hint="UML::LinkEndData" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scz2XlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LinkEndData.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndData"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LinkEndDestructionData" identifier="org.eclipse.papyrus.uml.LinkEndDestructionData" name="UML::LinkEndDestructionData" hint="UML::LinkEndDestructionData" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scz2YFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LinkEndDestructionData.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndDestructionData"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralBoolean" identifier="org.eclipse.papyrus.uml.LiteralBoolean" name="UML::LiteralBoolean" hint="UML::LiteralBoolean" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Scz2YlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralBoolean.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralBoolean"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralInteger" identifier="org.eclipse.papyrus.uml.LiteralInteger" name="UML::LiteralInteger" hint="UML::LiteralInteger" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.LiteralIntegerEditHelper">
-    <iconEntry xmi:id="_Sc1Ef1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralInteger.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralInteger"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralNull" identifier="org.eclipse.papyrus.uml.LiteralNull" name="UML::LiteralNull" hint="UML::LiteralNull" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc2SlFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralNull.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralNull"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralReal" identifier="org.eclipse.papyrus.uml.LiteralReal" name="UML::LiteralReal" hint="UML::LiteralReal" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc25wFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralReal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralReal"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralSpecification" identifier="org.eclipse.papyrus.uml.LiteralSpecification" name="UML::LiteralSpecification" hint="UML::LiteralSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc4Hx1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralString" identifier="org.eclipse.papyrus.uml.LiteralString" name="UML::LiteralString" hint="UML::LiteralString" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc4HyVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralString.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralString"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralUnlimitedNatural" identifier="org.eclipse.papyrus.uml.LiteralUnlimitedNatural" name="UML::LiteralUnlimitedNatural" hint="UML::LiteralUnlimitedNatural" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc4u7VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralUnlimitedNatural.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralUnlimitedNatural"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LoopNode" identifier="org.eclipse.papyrus.uml.LoopNode" name="UML::LoopNode" hint="UML::LoopNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper">
-    <iconEntry xmi:id="_Sc58-lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LoopNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//LoopNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Manifestation" identifier="org.eclipse.papyrus.uml.Manifestation" name="UML::Manifestation" hint="UML::Manifestation" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ManifestationEditHelper">
-    <iconEntry xmi:id="_Sc59C1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Manifestation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.MergeNode" identifier="org.eclipse.papyrus.uml.MergeNode" name="UML::MergeNode" hint="UML::MergeNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc59E1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/MergeNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MergeNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Message" identifier="org.eclipse.papyrus.uml.Message" name="UML::Message" hint="UML::Message" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.MessageEditHelper">
-    <iconEntry xmi:id="_Sc59FVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Message"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteAsynchMessage" description="Message messagekind is complete and message sort is asynchCall" identifier="org.eclipse.papyrus.uml.CompleteAsynchMessage" name="UML::CompleteAsynchMessage" hint="UML::CompleteAsynchMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteAsynchSignalMessage" description="Message messagekind is complete and message sort is asynchSignal" identifier="org.eclipse.papyrus.uml.CompleteAsynchSignalMessage" name="UML::CompleteAsynchSignalMessage" hint="UML::CompleteAsynchSignalMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteCreateMessage" description="Message messagekind is complete and message sort is createMessage" identifier="org.eclipse.papyrus.uml.CompleteCreateMessage" name="UML::CompleteCreateMessage" hint="UML::CompleteCreateMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteDeleteMessage" description="Message messagekind is complete and message sort is deleteMessage" identifier="org.eclipse.papyrus.uml.CompleteDeleteMessage" name="UML::CompleteDeleteMessage" hint="UML::CompleteDeleteMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteReplyMessage" description="Message messagekind is complete and message sort is reply" identifier="org.eclipse.papyrus.uml.CompleteReplyMessage" name="UML::CompleteReplyMessage" hint="UML::CompleteReplyMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteSynchMessage" description="Message messagekind is complete and message sort is synchCall" identifier="org.eclipse.papyrus.uml.CompleteSynchMessage" name="UML::CompleteSynchMessage" hint="UML::CompleteSynchMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FoundAsynchMessage" description="Message messagekind is found and message sort is asynchCall" identifier="org.eclipse.papyrus.uml.FoundAsynchMessage" name="UML::FoundAsynchMessage" hint="UML::FoundAsynchMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FoundAsynchSignalMessage" description="Message messagekind is found and message sort is asynchSignal" identifier="org.eclipse.papyrus.uml.FoundAsynchSignalMessage" name="UML::FoundAsynchSignalMessage" hint="UML::FoundAsynchSignalMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FoundCreateMessage" description="Message messagekind is found and message sort is createMessage" identifier="org.eclipse.papyrus.uml.FoundCreateMessage" name="UML::FoundCreateMessage" hint="UML::FoundCreateMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FoundDeleteMessage" description="Message messagekind is found and message sort is deleteMessage" identifier="org.eclipse.papyrus.uml.FoundDeleteMessage" name="UML::FoundDeleteMessage" hint="UML::FoundDeleteMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FoundReplyMessage" description="Message messagekind is Found and message sort is reply" identifier="org.eclipse.papyrus.uml.FoundReplyMessage" name="UML::FoundReplyMessage" hint="UML::FoundReplyMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LostAsynchMessage" description="Message messagekind is Lost and message sort is asynchCall" identifier="org.eclipse.papyrus.uml.LostAsynchMessage" name="UML::LostAsynchMessage" hint="UML::LostAsynchMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LostAsynchSignalMessage" description="Message messagekind is Lost and message sort is asynchSignal" identifier="org.eclipse.papyrus.uml.LostAsynchSignalMessage" name="UML::LostAsynchSignalMessage" hint="UML::LostAsynchSignalMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LostCreateMessage" description="Message messagekind is Lost and message sort is createMessage" identifier="org.eclipse.papyrus.uml.LostCreateMessage" name="UML::LostCreateMessage" hint="UML::LostCreateMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LostDeleteMessage" description="Message messagekind is Lost and message sort is deleteMessage" identifier="org.eclipse.papyrus.uml.LostDeleteMessage" name="UML::LostDeleteMessage" hint="UML::LostDeleteMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LostReplyMessage" description="Message messagekind is Lost and message sort is reply" identifier="org.eclipse.papyrus.uml.LostReplyMessage" name="UML::LostReplyMessage" hint="UML::LostReplyMessage" specializedTypes="org.eclipse.papyrus.uml.Message"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.MessageEnd" identifier="org.eclipse.papyrus.uml.MessageEnd" name="UML::MessageEnd" hint="UML::MessageEnd" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc59F1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/MessageEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageEnd"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.MessageEvent" identifier="org.eclipse.papyrus.uml.MessageEvent" name="UML::MessageEvent" hint="UML::MessageEvent" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc59GVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/MessageEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.MessageOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.MessageOccurrenceSpecification" name="UML::MessageOccurrenceSpecification" hint="UML::MessageOccurrenceSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc6kAVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/MessageOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageOccurrenceSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Model" identifier="org.eclipse.papyrus.uml.Model" name="UML::Model" hint="UML::Model" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc6kA1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Model"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.MultiplicityElement" identifier="org.eclipse.papyrus.uml.MultiplicityElement" name="UML::MultiplicityElement" hint="UML::MultiplicityElement" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc6kC1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/MultiplicityElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.NamedElement" identifier="org.eclipse.papyrus.uml.NamedElement" name="UML::NamedElement" hint="UML::NamedElement" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc6kDVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/NamedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Namespace" identifier="org.eclipse.papyrus.uml.Namespace" name="UML::Namespace" hint="UML::Namespace" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc6kD1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Namespace.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Node" identifier="org.eclipse.papyrus.uml.Node" name="UML::Node" hint="UML::Node" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc6kEVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Node"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ObjectFlow" identifier="org.eclipse.papyrus.uml.ObjectFlow" name="UML::ObjectFlow" hint="UML::ObjectFlow" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ObjectFlowEditHelper">
-    <iconEntry xmi:id="_Sc6kJVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ObjectFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ObjectFlow"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ObjectNode" identifier="org.eclipse.papyrus.uml.ObjectNode" name="UML::ObjectNode" hint="UML::ObjectNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc6kJ1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ObjectNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ObjectNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Observation" identifier="org.eclipse.papyrus.uml.Observation" name="UML::Observation" hint="UML::Observation" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc6kKVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Observation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Observation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OccurrenceSpecification" identifier="org.eclipse.papyrus.uml.OccurrenceSpecification" name="UML::OccurrenceSpecification" hint="UML::OccurrenceSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc7LEFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OccurrenceSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OpaqueAction" identifier="org.eclipse.papyrus.uml.OpaqueAction" name="UML::OpaqueAction" hint="UML::OpaqueAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc7LElYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OpaqueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OpaqueBehavior" identifier="org.eclipse.papyrus.uml.OpaqueBehavior" name="UML::OpaqueBehavior" hint="UML::OpaqueBehavior" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc7LGlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OpaqueExpression" identifier="org.eclipse.papyrus.uml.OpaqueExpression" name="UML::OpaqueExpression" hint="UML::OpaqueExpression" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc7yIlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OpaqueExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueExpression"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Operation" identifier="org.eclipse.papyrus.uml.Operation" name="UML::Operation" hint="UML::Operation" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc8ZVVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OperationTemplateParameterBase" identifier="org.eclipse.papyrus.uml.OperationTemplateParameterBase" name="UML::OperationTemplateParameterBase" hint="UML::OperationTemplateParameterBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc8ZV1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OperationTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OperationTemplateParameter"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OperationTemplateParameter" identifier="org.eclipse.papyrus.uml.OperationTemplateParameter" name="UML::OperationTemplateParameter" hint="UML::OperationTemplateParameter">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_vg_QMZXJEeSmV5hdT3HeBw" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.OperationTemplateParameterEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OperationTemplateParameterBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OutputPin" identifier="org.eclipse.papyrus.uml.OutputPin" name="UML::OutputPin" hint="UML::OutputPin" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc9ARFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//OutputPin"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Package" identifier="org.eclipse.papyrus.uml.Package" name="UML::Package" hint="UML::Package" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc9nZlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PackageImportBase" identifier="org.eclipse.papyrus.uml.PackageImportBase" name="UML::PackageImportBase" hint="UML::PackageImportBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PackageImportEditHelper">
-    <iconEntry xmi:id="_Sc9naFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/PackageImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageImport"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PackageImport" identifier="org.eclipse.papyrus.uml.PackageImport" name="UML::PackageImport" hint="UML::PackageImport">
-    <iconEntry xmi:id="_WI3T4AOyEeWv4ca2-olBmg" iconPath="/icons/full/obj16/PackageImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_LSLo4GN6EeSrwvaW5Is9PQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PackageImportEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageImportBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PackageMergeBase" identifier="org.eclipse.papyrus.uml.PackageMergeBase" name="UML::PackageMergeBase" hint="UML::PackageMergeBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PackageMergeEditHelper">
-    <iconEntry xmi:id="_Sc9nalYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/PackageMerge.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageMerge"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PackageMerge" identifier="org.eclipse.papyrus.uml.PackageMerge" name="UML::PackageMerge" hint="UML::PackageMerge">
-    <iconEntry xmi:id="_697XIAOyEeWv4ca2-olBmg" iconPath="/icons/full/obj16/PackageMerge.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_EJxd8GOJEeSw8rz5ZQEURQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PackageMergeEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageMergeBase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PackageableElement" identifier="org.eclipse.papyrus.uml.PackageableElement" name="UML::PackageableElement" hint="UML::PackageableElement" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc9nclYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageableElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConnectorEnd" identifier="org.eclipse.papyrus.uml.ConnectorEnd" name="UML::ConnectorEnd" hint="UML::ConnectorEnd" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccC-FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConnectorEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ConnectorEnd"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Parameter" identifier="org.eclipse.papyrus.uml.Parameter" name="UML::Parameter" hint="UML::Parameter" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc9ndFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ConsiderIgnoreFragment" identifier="org.eclipse.papyrus.uml.ConsiderIgnoreFragment" name="UML::ConsiderIgnoreFragment" hint="UML::ConsiderIgnoreFragment" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccC-lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ConsiderIgnoreFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ConsiderIgnoreFragment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ParameterSet" identifier="org.eclipse.papyrus.uml.ParameterSet" name="UML::ParameterSet" hint="UML::ParameterSet" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc9ndlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ParameterSet.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterSet"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint" identifier="org.eclipse.papyrus.uml.Constraint" name="UML::Constraint" hint="UML::Constraint" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ConstraintEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccC_FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Constraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ParameterableElement" identifier="org.eclipse.papyrus.uml.ParameterableElement" name="UML::ParameterableElement" hint="UML::ParameterableElement" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc-OZ1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ParameterableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint.ConstrainedElements" identifier="org.eclipse.papyrus.uml.Constraint.ConstrainedElements" name="UML::Constraint::ConstrainedElements" hint="UML::Constraint::ConstrainedElements" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_njRJoHbmEeSsxehP964iKQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsEditHelperAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PartDecomposition" identifier="org.eclipse.papyrus.uml.PartDecomposition" name="UML::PartDecomposition" hint="UML::PartDecomposition" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc-OaVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/PartDecomposition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PartDecomposition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Constraint.Context" identifier="org.eclipse.papyrus.uml.Constraint.Context" name="UML::Constraint::Context" hint="UML::Constraint::Context" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_rZSY8HbmEeSsxehP964iKQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextEditHelperAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Pin" identifier="org.eclipse.papyrus.uml.Pin" name="UML::Pin" hint="UML::Pin" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc-Oa1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Pin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Pin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Continuation" identifier="org.eclipse.papyrus.uml.Continuation" name="UML::Continuation" hint="UML::Continuation" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccDFlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Continuation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Continuation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Port" identifier="org.eclipse.papyrus.uml.Port" name="UML::Port" hint="UML::Port" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PortEditHelper">
-    <iconEntry xmi:id="_Sc-ObVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ControlFlow" identifier="org.eclipse.papyrus.uml.ControlFlow" name="UML::ControlFlow" hint="UML::ControlFlow" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ControlFlowEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccDGFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ControlFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ControlFlow"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PrimitiveType" identifier="org.eclipse.papyrus.uml.PrimitiveType" name="UML::PrimitiveType" hint="UML::PrimitiveType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc-OdVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ControlNode" identifier="org.eclipse.papyrus.uml.ControlNode" name="UML::ControlNode" hint="UML::ControlNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sccp8FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ControlNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ControlNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Profile" identifier="org.eclipse.papyrus.uml.Profile" name="UML::Profile" hint="UML::Profile" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc-Og1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Profile.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Profile"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CreateLinkAction" identifier="org.eclipse.papyrus.uml.CreateLinkAction" name="UML::CreateLinkAction" hint="UML::CreateLinkAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sccp8lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CreateLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateLinkAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ProfileApplication" identifier="org.eclipse.papyrus.uml.ProfileApplication" name="UML::ProfileApplication" hint="UML::ProfileApplication" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc-OhVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ProfileApplication.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProfileApplication"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CreateLinkObjectAction" identifier="org.eclipse.papyrus.uml.CreateLinkObjectAction" name="UML::CreateLinkObjectAction" hint="UML::CreateLinkObjectAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sccp-lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateLinkObjectAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Property" identifier="org.eclipse.papyrus.uml.Property" name="UML::Property" hint="UML::Property" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc-1cVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CreateObjectAction" identifier="org.eclipse.papyrus.uml.CreateObjectAction" name="UML::CreateObjectAction" hint="UML::CreateObjectAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccqAlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/CreateObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//CreateObjectAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PropertyPart" identifier="org.eclipse.papyrus.uml.PropertyPart" name="UML::PropertyPart" hint="UML::PropertyPart">
-    <iconEntry xmi:id="_5SIO8LhLEeSANYuUIb1qQA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_509PMLhLEeSANYuUIb1qQA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyPartHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DataStoreNode" identifier="org.eclipse.papyrus.uml.DataStoreNode" name="UML::DataStoreNode" hint="UML::DataStoreNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccqClYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DataStoreNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataStoreNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Property.Reference" identifier="org.eclipse.papyrus.uml.Property.Reference" name="UML::Property::Reference" hint="UML::Property::Reference">
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DataType" identifier="org.eclipse.papyrus.uml.DataType" name="UML::DataType" hint="UML::DataType" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccqDFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DataType"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ProtocolConformance" identifier="org.eclipse.papyrus.uml.ProtocolConformance" name="UML::ProtocolConformance" hint="UML::ProtocolConformance" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ProtocolConformanceEditHelper">
-    <iconEntry xmi:id="_Sc-1eVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ProtocolConformance.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolConformance"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DecisionNode" identifier="org.eclipse.papyrus.uml.DecisionNode" name="UML::DecisionNode" hint="UML::DecisionNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccqGlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DecisionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DecisionNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ProtocolStateMachine" identifier="org.eclipse.papyrus.uml.ProtocolStateMachine" name="UML::ProtocolStateMachine" hint="UML::ProtocolStateMachine" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ProtocolStateMachineEditHelper">
-    <iconEntry xmi:id="_Sc-1e1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolStateMachine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Dependency" identifier="org.eclipse.papyrus.uml.Dependency" name="UML::Dependency" hint="UML::Dependency" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccqHFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ProtocolTransition" identifier="org.eclipse.papyrus.uml.ProtocolTransition" name="UML::ProtocolTransition" hint="UML::ProtocolTransition" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc_cgFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ProtocolTransition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolTransition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CollaborationUse.RoleBinding" identifier="org.eclipse.papyrus.uml.CollaborationUse.RoleBinding" name="UML::CollaborationUse::RoleBinding" hint="UML::CollaborationUse::RoleBinding" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Dependency">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_m8FswLhAEeSANYuUIb1qQA" iconPath="/icons/CollaborationRoleBinding.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_Ao6QQLhBEeSANYuUIb1qQA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.RoleBindingHelperAdvice"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Pseudostate" identifier="org.eclipse.papyrus.uml.Pseudostate" name="UML::Pseudostate" hint="UML::Pseudostate" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc_cglYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DeployedArtifact" identifier="org.eclipse.papyrus.uml.DeployedArtifact" name="UML::DeployedArtifact" hint="UML::DeployedArtifact" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccqJFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DeployedArtifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DeployedArtifact"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.QualifierValue" identifier="org.eclipse.papyrus.uml.QualifierValue" name="UML::QualifierValue" hint="UML::QualifierValue" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_Sc_chFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/QualifierValue.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//QualifierValue"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Deployment" identifier="org.eclipse.papyrus.uml.Deployment" name="UML::Deployment" hint="UML::Deployment" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DeploymentEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SccqJlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Deployment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Deployment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.RaiseExceptionAction" identifier="org.eclipse.papyrus.uml.RaiseExceptionAction" name="UML::RaiseExceptionAction" hint="UML::RaiseExceptionAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc_chlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/RaiseExceptionAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RaiseExceptionAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DeploymentSpecification" identifier="org.eclipse.papyrus.uml.DeploymentSpecification" name="UML::DeploymentSpecification" hint="UML::DeploymentSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScdRAVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadExtentAction" identifier="org.eclipse.papyrus.uml.ReadExtentAction" name="UML::ReadExtentAction" hint="UML::ReadExtentAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc_cjlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadExtentAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadExtentAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DeploymentTarget" identifier="org.eclipse.papyrus.uml.DeploymentTarget" name="UML::DeploymentTarget" hint="UML::DeploymentTarget" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScdRD1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DeploymentTarget.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DeploymentTarget"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction" identifier="org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction" name="UML::ReadIsClassifiedObjectAction" hint="UML::ReadIsClassifiedObjectAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc_cllYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadIsClassifiedObjectAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DestroyLinkAction" identifier="org.eclipse.papyrus.uml.DestroyLinkAction" name="UML::DestroyLinkAction" hint="UML::DestroyLinkAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScdRF1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DestroyLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DestroyLinkAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadLinkAction" identifier="org.eclipse.papyrus.uml.ReadLinkAction" name="UML::ReadLinkAction" hint="UML::ReadLinkAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc_cnlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DestroyObjectAction" identifier="org.eclipse.papyrus.uml.DestroyObjectAction" name="UML::DestroyObjectAction" hint="UML::DestroyObjectAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScdRH1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DestroyObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DestroyObjectAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadLinkObjectEndAction" identifier="org.eclipse.papyrus.uml.ReadLinkObjectEndAction" name="UML::ReadLinkObjectEndAction" hint="UML::ReadLinkObjectEndAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc_cplYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadLinkObjectEndAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkObjectEndAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DestructionOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.DestructionOccurrenceSpecification" name="UML::DestructionOccurrenceSpecification" hint="UML::DestructionOccurrenceSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScdRJ1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DestructionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DestructionOccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction" identifier="org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction" name="UML::ReadLinkObjectEndQualifierAction" hint="UML::ReadLinkObjectEndQualifierAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_Sc_crlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadLinkObjectEndQualifierAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkObjectEndQualifierAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Device" identifier="org.eclipse.papyrus.uml.Device" name="UML::Device" hint="UML::Device" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScdRKVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Device"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadSelfAction" identifier="org.eclipse.papyrus.uml.ReadSelfAction" name="UML::ReadSelfAction" hint="UML::ReadSelfAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdADlFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadSelfAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadSelfAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DirectedRelationship" identifier="org.eclipse.papyrus.uml.DirectedRelationship" name="UML::DirectedRelationship" hint="UML::DirectedRelationship" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scd4FFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DirectedRelationship.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.ReadStructuralFeatureAction" name="UML::ReadStructuralFeatureAction" hint="UML::ReadStructuralFeatureAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdADnFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadStructuralFeatureAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Duration" identifier="org.eclipse.papyrus.uml.Duration" name="UML::Duration" hint="UML::Duration" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scd4FlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Duration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Duration"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadVariableAction" identifier="org.eclipse.papyrus.uml.ReadVariableAction" name="UML::ReadVariableAction" hint="UML::ReadVariableAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdADpFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadVariableAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationConstraint" identifier="org.eclipse.papyrus.uml.DurationConstraint" name="UML::DurationConstraint" hint="UML::DurationConstraint" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DurationConstraintEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scd4GFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Realization" identifier="org.eclipse.papyrus.uml.Realization" name="UML::Realization" hint="UML::Realization" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper">
-    <iconEntry xmi:id="_SdADrFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Realization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Realization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationInterval" identifier="org.eclipse.papyrus.uml.DurationInterval" name="UML::DurationInterval" hint="UML::DurationInterval" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scd4MlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DurationInterval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationInterval"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Reception" identifier="org.eclipse.papyrus.uml.Reception" name="UML::Reception" hint="UML::Reception" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdADtFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Reception.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Reception"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationObservation" identifier="org.eclipse.papyrus.uml.DurationObservation" name="UML::DurationObservation" hint="UML::DurationObservation" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ObservationEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScefS1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DurationObservation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReclassifyObjectAction" identifier="org.eclipse.papyrus.uml.ReclassifyObjectAction" name="UML::ReclassifyObjectAction" hint="UML::ReclassifyObjectAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdAqoVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReclassifyObjectAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.DurationObservation.Event" identifier="org.eclipse.papyrus.uml.DurationObservation.Event" name="UML::DurationObservation::Event" hint="UML::DurationObservation::Event" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_y8N2UFWsEeeGFsmbOwBrhg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.DurationObservationEventEditHelperAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.RedefinableElement" identifier="org.eclipse.papyrus.uml.RedefinableElement" name="UML::RedefinableElement" hint="UML::RedefinableElement" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdAqqVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/RedefinableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Element" identifier="org.eclipse.papyrus.uml.Element" name="UML::Element" hint="UML::Element" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScgUUVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.RedefinableTemplateSignature" identifier="org.eclipse.papyrus.uml.RedefinableTemplateSignature" name="UML::RedefinableTemplateSignature" hint="UML::RedefinableTemplateSignature" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdAqq1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableTemplateSignature"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ElementImportBase" identifier="org.eclipse.papyrus.uml.ElementImportBase" name="UML::ElementImportBase" hint="UML::ElementImportBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementImportEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScgUU1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ElementImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ElementImport"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReduceAction" identifier="org.eclipse.papyrus.uml.ReduceAction" name="UML::ReduceAction" hint="UML::ReduceAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdAqrVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReduceAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReduceAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ElementImport" identifier="org.eclipse.papyrus.uml.ElementImport" name="UML::ElementImport" hint="UML::ElementImport" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.ElementImportBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_H_ygYAOyEeWv4ca2-olBmg" iconPath="/icons/full/obj16/ElementImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_TB2dEJzPEeSEObywEoz_Cw" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementImportEditHelperAdvice"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Region" identifier="org.eclipse.papyrus.uml.Region" name="UML::Region" hint="UML::Region" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.RegionEditHelper">
-    <iconEntry xmi:id="_SdBRt1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Region.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.EncapsulatedClassifier" identifier="org.eclipse.papyrus.uml.EncapsulatedClassifier" name="UML::EncapsulatedClassifier" hint="UML::EncapsulatedClassifier" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScgUVVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/EncapsulatedClassifier.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EncapsulatedClassifier"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Relationship" identifier="org.eclipse.papyrus.uml.Relationship" name="UML::Relationship" hint="UML::Relationship" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdBRuVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Relationship.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Enumeration" identifier="org.eclipse.papyrus.uml.Enumeration" name="UML::Enumeration" hint="UML::Enumeration" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.EnumerationEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScgUV1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction" identifier="org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction" name="UML::RemoveStructuralFeatureValueAction" hint="UML::RemoveStructuralFeatureValueAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdBRu1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/RemoveStructuralFeatureValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RemoveStructuralFeatureValueAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.EnumerationLiteral" identifier="org.eclipse.papyrus.uml.EnumerationLiteral" name="UML::EnumerationLiteral" hint="UML::EnumerationLiteral" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScgUWVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//EnumerationLiteral"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.RemoveVariableValueAction" identifier="org.eclipse.papyrus.uml.RemoveVariableValueAction" name="UML::RemoveVariableValueAction" hint="UML::RemoveVariableValueAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdBRw1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/RemoveVariableValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//RemoveVariableValueAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Event" identifier="org.eclipse.papyrus.uml.Event" name="UML::Event" hint="UML::Event" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scg7ZVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Event.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Event"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReplyAction" identifier="org.eclipse.papyrus.uml.ReplyAction" name="UML::ReplyAction" hint="UML::ReplyAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdBRy1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReplyAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ReplyAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExceptionHandler" identifier="org.eclipse.papyrus.uml.ExceptionHandler" name="UML::ExceptionHandler" hint="UML::ExceptionHandler" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExceptionHandlerEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scg7Z1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExceptionHandler.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExceptionHandler"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.SendObjectAction" identifier="org.eclipse.papyrus.uml.SendObjectAction" name="UML::SendObjectAction" hint="UML::SendObjectAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdBR01YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/SendObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExecutableNode" identifier="org.eclipse.papyrus.uml.ExecutableNode" name="UML::ExecutableNode" hint="UML::ExecutableNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scg7aVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExecutableNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutableNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.SendSignalAction" identifier="org.eclipse.papyrus.uml.SendSignalAction" name="UML::SendSignalAction" hint="UML::SendSignalAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdB4x1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/SendSignalAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExecutionEnvironment" identifier="org.eclipse.papyrus.uml.ExecutionEnvironment" name="UML::ExecutionEnvironment" hint="UML::ExecutionEnvironment" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scg7a1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionEnvironment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.SequenceNode" identifier="org.eclipse.papyrus.uml.SequenceNode" name="UML::SequenceNode" hint="UML::SequenceNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.SequenceNodeHelper">
-    <iconEntry xmi:id="_SdB4z1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/SequenceNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SequenceNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification" name="UML::ExecutionOccurrenceSpecification" hint="UML::ExecutionOccurrenceSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SchiclYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExecutionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionOccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Signal" identifier="org.eclipse.papyrus.uml.Signal" name="UML::Signal" hint="UML::Signal" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdB44FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExecutionSpecification" identifier="org.eclipse.papyrus.uml.ExecutionSpecification" name="UML::ExecutionSpecification" hint="UML::ExecutionSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SchidFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExecutionSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.SignalEvent" identifier="org.eclipse.papyrus.uml.SignalEvent" name="UML::SignalEvent" hint="UML::SignalEvent" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdB44lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/SignalEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExpansionNode" identifier="org.eclipse.papyrus.uml.ExpansionNode" name="UML::ExpansionNode" hint="UML::ExpansionNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExpansionNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SchidlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Slot" identifier="org.eclipse.papyrus.uml.Slot" name="UML::Slot" hint="UML::Slot" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdCf41YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Slot.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Slot"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExpansionRegion" identifier="org.eclipse.papyrus.uml.ExpansionRegion" name="UML::ExpansionRegion" hint="UML::ExpansionRegion" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExpansionRegionHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SchieFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExpansionRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExpansionRegion"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StartClassifierBehaviorAction" identifier="org.eclipse.papyrus.uml.StartClassifierBehaviorAction" name="UML::StartClassifierBehaviorAction" hint="UML::StartClassifierBehaviorAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdCf5VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StartClassifierBehaviorAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Expression" identifier="org.eclipse.papyrus.uml.Expression" name="UML::Expression" hint="UML::Expression" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SchiiVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Expression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Expression"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StartObjectBehaviorAction" identifier="org.eclipse.papyrus.uml.StartObjectBehaviorAction" name="UML::StartObjectBehaviorAction" hint="UML::StartObjectBehaviorAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdCf7VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExtendBase" identifier="org.eclipse.papyrus.uml.ExtendBase" name="UML::ExtendBase" hint="UML::ExtendBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExtendEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScjXoFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Extend.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Extend"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.State" identifier="org.eclipse.papyrus.uml.State" name="UML::State" hint="UML::State" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdCf9VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/State.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Extend" identifier="org.eclipse.papyrus.uml.Extend" name="UML::Extend" hint="UML::Extend" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.ExtendBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_t3ycMFrNEeSNSq3G9Z6fKQ" iconPath="/icons/full/obj16/Extend.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_8QiDYFrNEeSNSq3G9Z6fKQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ExtendEditHelperAdvice"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StateInvariant" identifier="org.eclipse.papyrus.uml.StateInvariant" name="UML::StateInvariant" hint="UML::StateInvariant" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdCf91YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StateInvariant.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StateInvariant"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Extension" identifier="org.eclipse.papyrus.uml.Extension" name="UML::Extension" hint="UML::Extension" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ExtensionEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScjXolYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Extension.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Extension"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StateMachine" identifier="org.eclipse.papyrus.uml.StateMachine" name="UML::StateMachine" hint="UML::StateMachine" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdCf-VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExtensionEnd" identifier="org.eclipse.papyrus.uml.ExtensionEnd" name="UML::ExtensionEnd" hint="UML::ExtensionEnd" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScjXpFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExtensionEnd"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Stereotype" identifier="org.eclipse.papyrus.uml.Stereotype" name="UML::Stereotype" hint="UML::Stereotype" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdDG-FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Stereotype"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ExtensionPoint" identifier="org.eclipse.papyrus.uml.ExtensionPoint" name="UML::ExtensionPoint" hint="UML::ExtensionPoint" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScjXrFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ExtensionPoint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.StereotypePropertyReference" identifier="org.eclipse.papyrus.StereotypePropertyReference" name="UML::Stereotype::Property::Reference" hint="UML::Stereotype::Property::References" specializedTypes="org.eclipse.papyrus.uml.Property.Reference"/>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StringExpression" identifier="org.eclipse.papyrus.uml.StringExpression" name="UML::StringExpression" hint="UML::StringExpression" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdDHBlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StringExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StringExpression"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Feature" identifier="org.eclipse.papyrus.uml.Feature" name="UML::Feature" hint="UML::Feature" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScjXulYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Feature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Feature"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StructuralFeature" identifier="org.eclipse.papyrus.uml.StructuralFeature" name="UML::StructuralFeature" hint="UML::StructuralFeature" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdGKSVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StructuralFeature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuralFeature"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FinalNode" identifier="org.eclipse.papyrus.uml.FinalNode" name="UML::FinalNode" hint="UML::FinalNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scj-sVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/FinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//FinalNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StructuralFeatureAction" identifier="org.eclipse.papyrus.uml.StructuralFeatureAction" name="UML::StructuralFeatureAction" hint="UML::StructuralFeatureAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdGKS1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuralFeatureAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FinalState" identifier="org.eclipse.papyrus.uml.FinalState" name="UML::FinalState" hint="UML::FinalState" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScklwFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/FinalState.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//FinalState"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StructuredActivityNode" identifier="org.eclipse.papyrus.uml.StructuredActivityNode" name="UML::StructuredActivityNode" hint="UML::StructuredActivityNode" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper">
-    <iconEntry xmi:id="_SdGxQVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredActivityNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FlowFinalNode" identifier="org.eclipse.papyrus.uml.FlowFinalNode" name="UML::FlowFinalNode" hint="UML::FlowFinalNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScklwlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//FlowFinalNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StructuredClassifier" identifier="org.eclipse.papyrus.uml.StructuredClassifier" name="UML::StructuredClassifier" hint="UML::StructuredClassifier" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdGxUlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StructuredClassifier.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ForkNode" identifier="org.eclipse.papyrus.uml.ForkNode" name="UML::ForkNode" hint="UML::ForkNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScklxFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ForkNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Substitution" identifier="org.eclipse.papyrus.uml.Substitution" name="UML::Substitution" hint="UML::Substitution" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.SubstitutionEditHelper">
-    <iconEntry xmi:id="_SdGxVFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Substitution"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FunctionBehavior" identifier="org.eclipse.papyrus.uml.FunctionBehavior" name="UML::FunctionBehavior" hint="UML::FunctionBehavior" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScklxlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//FunctionBehavior"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateBinding" identifier="org.eclipse.papyrus.uml.TemplateBinding" name="UML::TemplateBinding" hint="UML::TemplateBinding" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TemplateBindingEditHelper">
-    <iconEntry xmi:id="_SdHYXFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TemplateBinding.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Gate" identifier="org.eclipse.papyrus.uml.Gate" name="UML::Gate" hint="UML::Gate" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sclz61YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Gate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Gate"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateParameterBase" identifier="org.eclipse.papyrus.uml.TemplateParameterBase" name="UML::TemplateParameterBase" hint="UML::TemplateParameterBase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdHYXlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.GeneralOrdering" identifier="org.eclipse.papyrus.uml.GeneralOrdering" name="UML::GeneralOrdering" hint="UML::GeneralOrdering" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sclz7VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/GeneralOrdering.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralOrdering"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateParameter" identifier="org.eclipse.papyrus.uml.TemplateParameter" name="UML::TemplateParameter" hint="UML::TemplateParameter">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_JCgQsZXMEeSmV5hdT3HeBw" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TemplateParameterEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TemplateParameterBase"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Generalization" identifier="org.eclipse.papyrus.uml.Generalization" name="UML::Generalization" hint="UML::Generalization" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.GeneralizationEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scma8VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Generalization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateParameterSubstitution" identifier="org.eclipse.papyrus.uml.TemplateParameterSubstitution" name="UML::TemplateParameterSubstitution" hint="UML::TemplateParameterSubstitution" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdHYYFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TemplateParameterSubstitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.GeneralizationSet" identifier="org.eclipse.papyrus.uml.GeneralizationSet" name="UML::GeneralizationSet" hint="UML::GeneralizationSet" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.GeneralizationSetEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScnCAVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/GeneralizationSet.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//GeneralizationSet"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateSignature" identifier="org.eclipse.papyrus.uml.TemplateSignature" name="UML::TemplateSignature" hint="UML::TemplateSignature" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdHYYlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateSignature"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateableElement" identifier="org.eclipse.papyrus.uml.TemplateableElement" name="UML::TemplateableElement" hint="UML::TemplateableElement" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdHYZFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TemplateableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TestIdentityAction" identifier="org.eclipse.papyrus.uml.TestIdentityAction" name="UML::TestIdentityAction" hint="UML::TestIdentityAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdHYZlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TestIdentityAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeConstraint" identifier="org.eclipse.papyrus.uml.TimeConstraint" name="UML::TimeConstraint" hint="UML::TimeConstraint" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TimeConstraintEditHelper">
-    <iconEntry xmi:id="_SdHYblYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeConstraint"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeEvent" identifier="org.eclipse.papyrus.uml.TimeEvent" name="UML::TimeEvent" hint="UML::TimeEvent" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdH_eVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TimeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeExpression" identifier="org.eclipse.papyrus.uml.TimeExpression" name="UML::TimeExpression" hint="UML::TimeExpression" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdImcVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TimeExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeExpression"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeInterval" identifier="org.eclipse.papyrus.uml.TimeInterval" name="UML::TimeInterval" hint="UML::TimeInterval" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdJNk1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TimeInterval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeInterval"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeObservation" identifier="org.eclipse.papyrus.uml.TimeObservation" name="UML::TimeObservation" hint="UML::TimeObservation" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ObservationEditHelper">
-    <iconEntry xmi:id="_SdKbv1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TimeObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeObservation"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeObservation.Event" identifier="org.eclipse.papyrus.uml.TimeObservation.Event" name="UML::TimeObservation::Event" hint="UML::TimeObservation::Event">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_CQre4FWtEeeGFsmbOwBrhg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TimeObservationEventEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Transition" identifier="org.eclipse.papyrus.uml.Transition" name="UML::Transition" hint="UML::Transition" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TransitionEditHelper">
-    <iconEntry xmi:id="_SdLCtlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Transition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Transition"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Trigger" identifier="org.eclipse.papyrus.uml.Trigger" name="UML::Trigger" hint="UML::Trigger" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdLCuFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Trigger.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Trigger"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Type" identifier="org.eclipse.papyrus.uml.Type" name="UML::Type" hint="UML::Type" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdLCulYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Type.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TypedElement" identifier="org.eclipse.papyrus.uml.TypedElement" name="UML::TypedElement" hint="UML::TypedElement" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdLCvFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TypedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.UnmarshallAction" identifier="org.eclipse.papyrus.uml.UnmarshallAction" name="UML::UnmarshallAction" hint="UML::UnmarshallAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdLCvlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/UnmarshallAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//UnmarshallAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Usage" identifier="org.eclipse.papyrus.uml.Usage" name="UML::Usage" hint="UML::Usage" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper">
-    <iconEntry xmi:id="_SdLCxlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Usage"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.UseCase" identifier="org.eclipse.papyrus.uml.UseCase" name="UML::UseCase" hint="UML::UseCase" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.UseCaseEditHelper">
-    <iconEntry xmi:id="_SdLCzlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//UseCase"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin" identifier="org.eclipse.papyrus.uml.ValuePin" name="UML::ValuePin" hint="UML::ValuePin" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdLp2FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ValuePin"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValueSpecification" identifier="org.eclipse.papyrus.uml.ValueSpecification" name="UML::ValueSpecification" hint="UML::ValueSpecification" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdM4AFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ValueSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValueSpecificationAction" identifier="org.eclipse.papyrus.uml.ValueSpecificationAction" name="UML::ValueSpecificationAction" hint="UML::ValueSpecificationAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdM4AlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ValueSpecificationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecificationAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Variable" identifier="org.eclipse.papyrus.uml.Variable" name="UML::Variable" hint="UML::Variable" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdNe8VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Variable.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Variable"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.VariableAction" identifier="org.eclipse.papyrus.uml.VariableAction" name="UML::VariableAction" hint="UML::VariableAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdNe81YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/VariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//VariableAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Vertex" identifier="org.eclipse.papyrus.uml.Vertex" name="UML::Vertex" hint="UML::Vertex" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
-    <iconEntry xmi:id="_SdNe-1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Vertex.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//Vertex"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.WriteLinkAction" identifier="org.eclipse.papyrus.uml.WriteLinkAction" name="UML::WriteLinkAction" hint="UML::WriteLinkAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdNe_VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/WriteLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteLinkAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.WriteStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.WriteStructuralFeatureAction" name="UML::WriteStructuralFeatureAction" hint="UML::WriteStructuralFeatureAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdNe_1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/WriteStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.WriteVariableAction" identifier="org.eclipse.papyrus.uml.WriteVariableAction" name="UML::WriteVariableAction" hint="UML::WriteVariableAction" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
-    <iconEntry xmi:id="_SdNfAVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/WriteVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <eClass href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteVariableAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Trace" identifier="org.eclipse.papyrus.uml.Trace" name="UML::Trace" hint="UML::Trace">
-    <iconEntry xmi:id="_QcxB0AO0EeWv4ca2-olBmg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_JPmakWskEeSELtwF_9-6fg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TraceEditHelperAdvice"/>
-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_LDOUUGskEeSELtwF_9-6fg" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.TraceMatcher"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Refine" identifier="org.eclipse.papyrus.uml.Refine" name="UML::Refine" hint="UML::Refine">
-    <iconEntry xmi:id="_N0U_8AO0EeWv4ca2-olBmg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_UGdZ8WslEeSELtwF_9-6fg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.RefineEditHelperAdvice"/>
-    <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_UGdZ8mslEeSELtwF_9-6fg" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.RefineMatcher"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Element.OwnedElement" description="Created to support the ContainmentLink" identifier="org.eclipse.papyrus.uml.Element.OwnedElement" name="UML::Element::OwnedElement" hint="UML::Element::OwnedElement">
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_JdUX4MHTEeSpuJnfbRdiWQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementOwnedElementEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="../../../plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_wayS0BgzEeaW-4uSpAcmpQ" identifier="org.eclipse.papyrus.uml.advice.ConstraintDestroyConstrainedElements" target="org.eclipse.papyrus.uml.Constraint" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintDestroyConstrainedElementsEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_pSKXgBa4EeaJFJ1Mo_kk8w" identifier="org.eclipse.papyrus.uml.advice.CommentDestroyAnnotatedElements" target="org.eclipse.papyrus.uml.Comment" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentDestroyAnnotatedElementsEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" identifier="org.eclipse.papyrus.uml.advice.Containment" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementOwnedElementReorientEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_6AWx0MJaEeSl6M4_Zhyt7Q" identifier="org.eclipse.papyrus.uml.advice.ConstraintConstrainedElementsReorient" target="org.eclipse.papyrus.uml.Constraint" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsReorientEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Biw5sMdFEeS1POoqrCEMrQ" description="" identifier="org.eclipse.papyrus.uml.advice.CommentAnnotatedElementsReorient" target="org.eclipse.papyrus.uml.Comment" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsReorientEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_6RSpMEUTEeeiG9SnzxhgUQ" description="" identifier="org.eclipse.papyrus.uml.advice.StereotypePropertyReferenceReorientEditHelperAdvice" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypePropertyReferenceReorientEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_ID_7oFWdEee8aO8EwpogNQ" description="Helper advice on ojbect to delete reference view at stereotype reference changes" identifier="org.eclipse.papyrus.uml.advice.StereotypePropertyReferenceSetEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypePropertyReferenceSetEditHelperAdvice">
-    <target xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#org.eclipse.papyrus.infra.emf.page"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Image" identifier="org.eclipse.papyrus.uml.Image" name="UML::Image" hint="UML::Image" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScnCCVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Image.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Image"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Include" identifier="org.eclipse.papyrus.uml.Include" name="UML::Include" hint="UML::Include" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.IncludeEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScnCC1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Include.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Include"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InformationFlowBase" identifier="org.eclipse.papyrus.uml.InformationFlowBase" name="UML::InformationFlowBase" hint="UML::InformationFlowBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InformationFlowEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScnCDVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InformationFlow"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InformationFlow" identifier="org.eclipse.papyrus.uml.InformationFlow" name="UML::InformationFlow" hint="UML::InformationFlow" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.InformationFlowBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_jt-DYLgeEeSANYuUIb1qQA" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_lfPMsLgeEeSANYuUIb1qQA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InformationFlowEditHelperAdvice"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InformationItem" identifier="org.eclipse.papyrus.uml.InformationItem" name="UML::InformationItem" hint="UML::InformationItem" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScnCFVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InformationItem"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InitialNode" identifier="org.eclipse.papyrus.uml.InitialNode" name="UML::InitialNode" hint="UML::InitialNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sco3OlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InitialNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InputPin" identifier="org.eclipse.papyrus.uml.InputPin" name="UML::InputPin" hint="UML::InputPin" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sco3PFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InputPin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InstanceSpecification" identifier="org.eclipse.papyrus.uml.InstanceSpecification" name="UML::InstanceSpecification" hint="UML::InstanceSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InstanceSpecificationEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scr6ilYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InstanceSpecification"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InstanceSpecification.Link" identifier="org.eclipse.papyrus.uml.InstanceSpecification.Link" name="UML::InstanceSpecification::Link" hint="UML::InstanceSpecification::Link" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.InstanceSpecification">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_bvHrYZXNEeSmV5hdT3HeBw" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InstanceSpecificationEditHelperAdvice"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InstanceValue" identifier="org.eclipse.papyrus.uml.InstanceValue" name="UML::InstanceValue" hint="UML::InstanceValue" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scr6klYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InstanceValue.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InstanceValue"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Interaction" identifier="org.eclipse.papyrus.uml.Interaction" name="UML::Interaction" hint="UML::Interaction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InteractionEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SctIslYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interaction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InteractionConstraint" identifier="org.eclipse.papyrus.uml.InteractionConstraint" name="UML::InteractionConstraint" hint="UML::InteractionConstraint" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SctItFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InteractionConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionConstraint"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InteractionFragment" identifier="org.eclipse.papyrus.uml.InteractionFragment" name="UML::InteractionFragment" hint="UML::InteractionFragment" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sctvw1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InteractionFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionFragment"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InteractionOperand" identifier="org.eclipse.papyrus.uml.InteractionOperand" name="UML::InteractionOperand" hint="UML::InteractionOperand" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InteractionOperandEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SctvxVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InteractionOperand.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionOperand"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InteractionUse" identifier="org.eclipse.papyrus.uml.InteractionUse" name="UML::InteractionUse" hint="UML::InteractionUse" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sctvx1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InteractionUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InteractionUse"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Interface" identifier="org.eclipse.papyrus.uml.Interface" name="UML::Interface" hint="UML::Interface" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScuW2lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interface"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InterfaceRealization" identifier="org.eclipse.papyrus.uml.InterfaceRealization" name="UML::InterfaceRealization" hint="UML::InterfaceRealization" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InterfaceRealizationEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scvk4FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InterfaceRealization"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InterruptibleActivityRegion" identifier="org.eclipse.papyrus.uml.InterruptibleActivityRegion" name="UML::InterruptibleActivityRegion" hint="UML::InterruptibleActivityRegion" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.InterruptibleActivityRegionHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScwL-lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InterruptibleActivityRegion"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Interval" identifier="org.eclipse.papyrus.uml.Interval" name="UML::Interval" hint="UML::Interval" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScwL_FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Interval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Interval"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.IntervalConstraint" identifier="org.eclipse.papyrus.uml.IntervalConstraint" name="UML::IntervalConstraint" hint="UML::IntervalConstraint" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.IntervalConstraintEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ScxaEVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//IntervalConstraint"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.InvocationAction" identifier="org.eclipse.papyrus.uml.InvocationAction" name="UML::InvocationAction" hint="UML::InvocationAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scz2VFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/InvocationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InvocationAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.JoinNode" identifier="org.eclipse.papyrus.uml.JoinNode" name="UML::JoinNode" hint="UML::JoinNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scz2VlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//JoinNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Lifeline" identifier="org.eclipse.papyrus.uml.Lifeline" name="UML::Lifeline" hint="UML::Lifeline" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.LifelineEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scz2WFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Lifeline.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Lifeline"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LinkAction" identifier="org.eclipse.papyrus.uml.LinkAction" name="UML::LinkAction" hint="UML::LinkAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scz2WlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LinkEndCreationData" identifier="org.eclipse.papyrus.uml.LinkEndCreationData" name="UML::LinkEndCreationData" hint="UML::LinkEndCreationData" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scz2XFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LinkEndCreationData.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndCreationData"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LinkEndData" identifier="org.eclipse.papyrus.uml.LinkEndData" name="UML::LinkEndData" hint="UML::LinkEndData" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scz2XlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LinkEndData.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndData"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LinkEndDestructionData" identifier="org.eclipse.papyrus.uml.LinkEndDestructionData" name="UML::LinkEndDestructionData" hint="UML::LinkEndDestructionData" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scz2YFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LinkEndDestructionData.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LinkEndDestructionData"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralBoolean" identifier="org.eclipse.papyrus.uml.LiteralBoolean" name="UML::LiteralBoolean" hint="UML::LiteralBoolean" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Scz2YlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralBoolean.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralBoolean"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralInteger" identifier="org.eclipse.papyrus.uml.LiteralInteger" name="UML::LiteralInteger" hint="UML::LiteralInteger" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.LiteralIntegerEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc1Ef1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralInteger.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralInteger"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralNull" identifier="org.eclipse.papyrus.uml.LiteralNull" name="UML::LiteralNull" hint="UML::LiteralNull" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc2SlFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralNull.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralNull"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralReal" identifier="org.eclipse.papyrus.uml.LiteralReal" name="UML::LiteralReal" hint="UML::LiteralReal" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc25wFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralReal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralReal"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralSpecification" identifier="org.eclipse.papyrus.uml.LiteralSpecification" name="UML::LiteralSpecification" hint="UML::LiteralSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc4Hx1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralSpecification"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralString" identifier="org.eclipse.papyrus.uml.LiteralString" name="UML::LiteralString" hint="UML::LiteralString" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc4HyVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralString.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralString"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LiteralUnlimitedNatural" identifier="org.eclipse.papyrus.uml.LiteralUnlimitedNatural" name="UML::LiteralUnlimitedNatural" hint="UML::LiteralUnlimitedNatural" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc4u7VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LiteralUnlimitedNatural.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LiteralUnlimitedNatural"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LoopNode" identifier="org.eclipse.papyrus.uml.LoopNode" name="UML::LoopNode" hint="UML::LoopNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc58-lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/LoopNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//LoopNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Manifestation" identifier="org.eclipse.papyrus.uml.Manifestation" name="UML::Manifestation" hint="UML::Manifestation" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ManifestationEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc59C1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Manifestation"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.MergeNode" identifier="org.eclipse.papyrus.uml.MergeNode" name="UML::MergeNode" hint="UML::MergeNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc59E1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/MergeNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//MergeNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Message" identifier="org.eclipse.papyrus.uml.Message" name="UML::Message" hint="UML::Message" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.MessageEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc59FVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Message"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteAsynchMessage" description="Message messagekind is complete and message sort is asynchCall" identifier="org.eclipse.papyrus.uml.CompleteAsynchMessage" name="UML::CompleteAsynchMessage" hint="UML::CompleteAsynchMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteAsynchSignalMessage" description="Message messagekind is complete and message sort is asynchSignal" identifier="org.eclipse.papyrus.uml.CompleteAsynchSignalMessage" name="UML::CompleteAsynchSignalMessage" hint="UML::CompleteAsynchSignalMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteCreateMessage" description="Message messagekind is complete and message sort is createMessage" identifier="org.eclipse.papyrus.uml.CompleteCreateMessage" name="UML::CompleteCreateMessage" hint="UML::CompleteCreateMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteDeleteMessage" description="Message messagekind is complete and message sort is deleteMessage" identifier="org.eclipse.papyrus.uml.CompleteDeleteMessage" name="UML::CompleteDeleteMessage" hint="UML::CompleteDeleteMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteReplyMessage" description="Message messagekind is complete and message sort is reply" identifier="org.eclipse.papyrus.uml.CompleteReplyMessage" name="UML::CompleteReplyMessage" hint="UML::CompleteReplyMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.CompleteSynchMessage" description="Message messagekind is complete and message sort is synchCall" identifier="org.eclipse.papyrus.uml.CompleteSynchMessage" name="UML::CompleteSynchMessage" hint="UML::CompleteSynchMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FoundAsynchMessage" description="Message messagekind is found and message sort is asynchCall" identifier="org.eclipse.papyrus.uml.FoundAsynchMessage" name="UML::FoundAsynchMessage" hint="UML::FoundAsynchMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FoundAsynchSignalMessage" description="Message messagekind is found and message sort is asynchSignal" identifier="org.eclipse.papyrus.uml.FoundAsynchSignalMessage" name="UML::FoundAsynchSignalMessage" hint="UML::FoundAsynchSignalMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FoundCreateMessage" description="Message messagekind is found and message sort is createMessage" identifier="org.eclipse.papyrus.uml.FoundCreateMessage" name="UML::FoundCreateMessage" hint="UML::FoundCreateMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FoundDeleteMessage" description="Message messagekind is found and message sort is deleteMessage" identifier="org.eclipse.papyrus.uml.FoundDeleteMessage" name="UML::FoundDeleteMessage" hint="UML::FoundDeleteMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.FoundReplyMessage" description="Message messagekind is Found and message sort is reply" identifier="org.eclipse.papyrus.uml.FoundReplyMessage" name="UML::FoundReplyMessage" hint="UML::FoundReplyMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LostAsynchMessage" description="Message messagekind is Lost and message sort is asynchCall" identifier="org.eclipse.papyrus.uml.LostAsynchMessage" name="UML::LostAsynchMessage" hint="UML::LostAsynchMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LostAsynchSignalMessage" description="Message messagekind is Lost and message sort is asynchSignal" identifier="org.eclipse.papyrus.uml.LostAsynchSignalMessage" name="UML::LostAsynchSignalMessage" hint="UML::LostAsynchSignalMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LostCreateMessage" description="Message messagekind is Lost and message sort is createMessage" identifier="org.eclipse.papyrus.uml.LostCreateMessage" name="UML::LostCreateMessage" hint="UML::LostCreateMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LostDeleteMessage" description="Message messagekind is Lost and message sort is deleteMessage" identifier="org.eclipse.papyrus.uml.LostDeleteMessage" name="UML::LostDeleteMessage" hint="UML::LostDeleteMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.LostReplyMessage" description="Message messagekind is Lost and message sort is reply" identifier="org.eclipse.papyrus.uml.LostReplyMessage" name="UML::LostReplyMessage" hint="UML::LostReplyMessage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.MessageEnd" identifier="org.eclipse.papyrus.uml.MessageEnd" name="UML::MessageEnd" hint="UML::MessageEnd" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc59F1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/MessageEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageEnd"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.MessageEvent" identifier="org.eclipse.papyrus.uml.MessageEvent" name="UML::MessageEvent" hint="UML::MessageEvent" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc59GVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/MessageEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.MessageOccurrenceSpecification" identifier="org.eclipse.papyrus.uml.MessageOccurrenceSpecification" name="UML::MessageOccurrenceSpecification" hint="UML::MessageOccurrenceSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc6kAVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/MessageOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//MessageOccurrenceSpecification"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Model" identifier="org.eclipse.papyrus.uml.Model" name="UML::Model" hint="UML::Model" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc6kA1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Model"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.MultiplicityElement" identifier="org.eclipse.papyrus.uml.MultiplicityElement" name="UML::MultiplicityElement" hint="UML::MultiplicityElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc6kC1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/MultiplicityElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//MultiplicityElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.NamedElement" identifier="org.eclipse.papyrus.uml.NamedElement" name="UML::NamedElement" hint="UML::NamedElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc6kDVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/NamedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Namespace" identifier="org.eclipse.papyrus.uml.Namespace" name="UML::Namespace" hint="UML::Namespace" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc6kD1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Namespace.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Node" identifier="org.eclipse.papyrus.uml.Node" name="UML::Node" hint="UML::Node" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc6kEVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Node"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ObjectFlow" identifier="org.eclipse.papyrus.uml.ObjectFlow" name="UML::ObjectFlow" hint="UML::ObjectFlow" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ObjectFlowEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc6kJVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ObjectFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ObjectFlow"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ObjectNode" identifier="org.eclipse.papyrus.uml.ObjectNode" name="UML::ObjectNode" hint="UML::ObjectNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc6kJ1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ObjectNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ObjectNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Observation" identifier="org.eclipse.papyrus.uml.Observation" name="UML::Observation" hint="UML::Observation" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc6kKVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Observation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Observation"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OccurrenceSpecification" identifier="org.eclipse.papyrus.uml.OccurrenceSpecification" name="UML::OccurrenceSpecification" hint="UML::OccurrenceSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc7LEFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OccurrenceSpecification"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OpaqueAction" identifier="org.eclipse.papyrus.uml.OpaqueAction" name="UML::OpaqueAction" hint="UML::OpaqueAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc7LElYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OpaqueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OpaqueBehavior" identifier="org.eclipse.papyrus.uml.OpaqueBehavior" name="UML::OpaqueBehavior" hint="UML::OpaqueBehavior" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc7LGlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OpaqueExpression" identifier="org.eclipse.papyrus.uml.OpaqueExpression" name="UML::OpaqueExpression" hint="UML::OpaqueExpression" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc7yIlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OpaqueExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueExpression"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Operation" identifier="org.eclipse.papyrus.uml.Operation" name="UML::Operation" hint="UML::Operation" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc8ZVVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OperationTemplateParameterBase" identifier="org.eclipse.papyrus.uml.OperationTemplateParameterBase" name="UML::OperationTemplateParameterBase" hint="UML::OperationTemplateParameterBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc8ZV1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OperationTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OperationTemplateParameter"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OperationTemplateParameter" identifier="org.eclipse.papyrus.uml.OperationTemplateParameter" name="UML::OperationTemplateParameter" hint="UML::OperationTemplateParameter" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.OperationTemplateParameterBase">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_vg_QMZXJEeSmV5hdT3HeBw" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.OperationTemplateParameterEditHelperAdvice"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.OutputPin" identifier="org.eclipse.papyrus.uml.OutputPin" name="UML::OutputPin" hint="UML::OutputPin" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc9ARFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OutputPin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Package" identifier="org.eclipse.papyrus.uml.Package" name="UML::Package" hint="UML::Package" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc9nZlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PackageImportBase" identifier="org.eclipse.papyrus.uml.PackageImportBase" name="UML::PackageImportBase" hint="UML::PackageImportBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PackageImportEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc9naFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/PackageImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageImport"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PackageImport" identifier="org.eclipse.papyrus.uml.PackageImport" name="UML::PackageImport" hint="UML::PackageImport" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.PackageImportBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_WI3T4AOyEeWv4ca2-olBmg" iconPath="/icons/full/obj16/PackageImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_LSLo4GN6EeSrwvaW5Is9PQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PackageImportEditHelperAdvice"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PackageMergeBase" identifier="org.eclipse.papyrus.uml.PackageMergeBase" name="UML::PackageMergeBase" hint="UML::PackageMergeBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PackageMergeEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc9nalYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/PackageMerge.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageMerge"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PackageMerge" identifier="org.eclipse.papyrus.uml.PackageMerge" name="UML::PackageMerge" hint="UML::PackageMerge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.PackageMergeBase">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_697XIAOyEeWv4ca2-olBmg" iconPath="/icons/full/obj16/PackageMerge.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_EJxd8GOJEeSw8rz5ZQEURQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PackageMergeEditHelperAdvice"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PackageableElement" identifier="org.eclipse.papyrus.uml.PackageableElement" name="UML::PackageableElement" hint="UML::PackageableElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc9nclYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/PackageableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PackageableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Parameter" identifier="org.eclipse.papyrus.uml.Parameter" name="UML::Parameter" hint="UML::Parameter" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc9ndFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ParameterSet" identifier="org.eclipse.papyrus.uml.ParameterSet" name="UML::ParameterSet" hint="UML::ParameterSet" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc9ndlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ParameterSet.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterSet"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ParameterableElement" identifier="org.eclipse.papyrus.uml.ParameterableElement" name="UML::ParameterableElement" hint="UML::ParameterableElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc-OZ1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ParameterableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ParameterableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PartDecomposition" identifier="org.eclipse.papyrus.uml.PartDecomposition" name="UML::PartDecomposition" hint="UML::PartDecomposition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc-OaVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/PartDecomposition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PartDecomposition"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Pin" identifier="org.eclipse.papyrus.uml.Pin" name="UML::Pin" hint="UML::Pin" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc-Oa1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Pin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Port" identifier="org.eclipse.papyrus.uml.Port" name="UML::Port" hint="UML::Port" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.PortEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc-ObVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Port"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PrimitiveType" identifier="org.eclipse.papyrus.uml.PrimitiveType" name="UML::PrimitiveType" hint="UML::PrimitiveType" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc-OdVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Profile" identifier="org.eclipse.papyrus.uml.Profile" name="UML::Profile" hint="UML::Profile" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc-Og1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Profile.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Profile"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ProfileApplication" identifier="org.eclipse.papyrus.uml.ProfileApplication" name="UML::ProfileApplication" hint="UML::ProfileApplication" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc-OhVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ProfileApplication.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ProfileApplication"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Property" identifier="org.eclipse.papyrus.uml.Property" name="UML::Property" hint="UML::Property" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc-1cVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.PropertyPart" identifier="org.eclipse.papyrus.uml.PropertyPart" name="UML::PropertyPart" hint="UML::PropertyPart" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Property">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_5SIO8LhLEeSANYuUIb1qQA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_509PMLhLEeSANYuUIb1qQA" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyPartHelperAdvice"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Property.Reference" identifier="org.eclipse.papyrus.uml.Property.Reference" name="UML::Property::Reference" hint="UML::Property::Reference" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <specializedTypes xmi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ProtocolConformance" identifier="org.eclipse.papyrus.uml.ProtocolConformance" name="UML::ProtocolConformance" hint="UML::ProtocolConformance" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ProtocolConformanceEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc-1eVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ProtocolConformance.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolConformance"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ProtocolStateMachine" identifier="org.eclipse.papyrus.uml.ProtocolStateMachine" name="UML::ProtocolStateMachine" hint="UML::ProtocolStateMachine" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ProtocolStateMachineEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc-1e1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolStateMachine"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ProtocolTransition" identifier="org.eclipse.papyrus.uml.ProtocolTransition" name="UML::ProtocolTransition" hint="UML::ProtocolTransition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc_cgFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ProtocolTransition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ProtocolTransition"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Pseudostate" identifier="org.eclipse.papyrus.uml.Pseudostate" name="UML::Pseudostate" hint="UML::Pseudostate" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc_cglYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Pseudostate"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.QualifierValue" identifier="org.eclipse.papyrus.uml.QualifierValue" name="UML::QualifierValue" hint="UML::QualifierValue" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc_chFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/QualifierValue.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//QualifierValue"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.RaiseExceptionAction" identifier="org.eclipse.papyrus.uml.RaiseExceptionAction" name="UML::RaiseExceptionAction" hint="UML::RaiseExceptionAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc_chlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/RaiseExceptionAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RaiseExceptionAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadExtentAction" identifier="org.eclipse.papyrus.uml.ReadExtentAction" name="UML::ReadExtentAction" hint="UML::ReadExtentAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc_cjlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadExtentAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadExtentAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction" identifier="org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction" name="UML::ReadIsClassifiedObjectAction" hint="UML::ReadIsClassifiedObjectAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc_cllYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadIsClassifiedObjectAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadLinkAction" identifier="org.eclipse.papyrus.uml.ReadLinkAction" name="UML::ReadLinkAction" hint="UML::ReadLinkAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc_cnlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadLinkObjectEndAction" identifier="org.eclipse.papyrus.uml.ReadLinkObjectEndAction" name="UML::ReadLinkObjectEndAction" hint="UML::ReadLinkObjectEndAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc_cplYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadLinkObjectEndAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkObjectEndAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction" identifier="org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction" name="UML::ReadLinkObjectEndQualifierAction" hint="UML::ReadLinkObjectEndQualifierAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Sc_crlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadLinkObjectEndQualifierAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadLinkObjectEndQualifierAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadSelfAction" identifier="org.eclipse.papyrus.uml.ReadSelfAction" name="UML::ReadSelfAction" hint="UML::ReadSelfAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdADlFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadSelfAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadSelfAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.ReadStructuralFeatureAction" name="UML::ReadStructuralFeatureAction" hint="UML::ReadStructuralFeatureAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdADnFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadStructuralFeatureAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReadVariableAction" identifier="org.eclipse.papyrus.uml.ReadVariableAction" name="UML::ReadVariableAction" hint="UML::ReadVariableAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdADpFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReadVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReadVariableAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Realization" identifier="org.eclipse.papyrus.uml.Realization" name="UML::Realization" hint="UML::Realization" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdADrFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Realization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Realization"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Reception" identifier="org.eclipse.papyrus.uml.Reception" name="UML::Reception" hint="UML::Reception" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdADtFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Reception.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Reception"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReclassifyObjectAction" identifier="org.eclipse.papyrus.uml.ReclassifyObjectAction" name="UML::ReclassifyObjectAction" hint="UML::ReclassifyObjectAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdAqoVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReclassifyObjectAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.RedefinableElement" identifier="org.eclipse.papyrus.uml.RedefinableElement" name="UML::RedefinableElement" hint="UML::RedefinableElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdAqqVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/RedefinableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.RedefinableTemplateSignature" identifier="org.eclipse.papyrus.uml.RedefinableTemplateSignature" name="UML::RedefinableTemplateSignature" hint="UML::RedefinableTemplateSignature" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdAqq1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RedefinableTemplateSignature"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReduceAction" identifier="org.eclipse.papyrus.uml.ReduceAction" name="UML::ReduceAction" hint="UML::ReduceAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdAqrVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReduceAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReduceAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Region" identifier="org.eclipse.papyrus.uml.Region" name="UML::Region" hint="UML::Region" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.RegionEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdBRt1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Region.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Region"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Relationship" identifier="org.eclipse.papyrus.uml.Relationship" name="UML::Relationship" hint="UML::Relationship" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdBRuVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Relationship.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction" identifier="org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction" name="UML::RemoveStructuralFeatureValueAction" hint="UML::RemoveStructuralFeatureValueAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdBRu1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/RemoveStructuralFeatureValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RemoveStructuralFeatureValueAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.RemoveVariableValueAction" identifier="org.eclipse.papyrus.uml.RemoveVariableValueAction" name="UML::RemoveVariableValueAction" hint="UML::RemoveVariableValueAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdBRw1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/RemoveVariableValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//RemoveVariableValueAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ReplyAction" identifier="org.eclipse.papyrus.uml.ReplyAction" name="UML::ReplyAction" hint="UML::ReplyAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdBRy1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ReplyAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ReplyAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.SendObjectAction" identifier="org.eclipse.papyrus.uml.SendObjectAction" name="UML::SendObjectAction" hint="UML::SendObjectAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdBR01YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/SendObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendObjectAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.SendSignalAction" identifier="org.eclipse.papyrus.uml.SendSignalAction" name="UML::SendSignalAction" hint="UML::SendSignalAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdB4x1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/SendSignalAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SendSignalAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.SequenceNode" identifier="org.eclipse.papyrus.uml.SequenceNode" name="UML::SequenceNode" hint="UML::SequenceNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.SequenceNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdB4z1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/SequenceNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SequenceNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Signal" identifier="org.eclipse.papyrus.uml.Signal" name="UML::Signal" hint="UML::Signal" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdB44FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Signal"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.SignalEvent" identifier="org.eclipse.papyrus.uml.SignalEvent" name="UML::SignalEvent" hint="UML::SignalEvent" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdB44lYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/SignalEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//SignalEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Slot" identifier="org.eclipse.papyrus.uml.Slot" name="UML::Slot" hint="UML::Slot" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdCf41YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Slot.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Slot"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StartClassifierBehaviorAction" identifier="org.eclipse.papyrus.uml.StartClassifierBehaviorAction" name="UML::StartClassifierBehaviorAction" hint="UML::StartClassifierBehaviorAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdCf5VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StartClassifierBehaviorAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StartObjectBehaviorAction" identifier="org.eclipse.papyrus.uml.StartObjectBehaviorAction" name="UML::StartObjectBehaviorAction" hint="UML::StartObjectBehaviorAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdCf7VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StartObjectBehaviorAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.State" identifier="org.eclipse.papyrus.uml.State" name="UML::State" hint="UML::State" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdCf9VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/State.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StateInvariant" identifier="org.eclipse.papyrus.uml.StateInvariant" name="UML::StateInvariant" hint="UML::StateInvariant" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdCf91YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StateInvariant.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateInvariant"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StateMachine" identifier="org.eclipse.papyrus.uml.StateMachine" name="UML::StateMachine" hint="UML::StateMachine" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdCf-VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StateMachine"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Stereotype" identifier="org.eclipse.papyrus.uml.Stereotype" name="UML::Stereotype" hint="UML::Stereotype" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdDG-FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Stereotype"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.StereotypePropertyReference" identifier="org.eclipse.papyrus.StereotypePropertyReference" name="UML::Stereotype::Property::Reference" hint="UML::Stereotype::Property::References" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Property.Reference"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StringExpression" identifier="org.eclipse.papyrus.uml.StringExpression" name="UML::StringExpression" hint="UML::StringExpression" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdDHBlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StringExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StringExpression"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StructuralFeature" identifier="org.eclipse.papyrus.uml.StructuralFeature" name="UML::StructuralFeature" hint="UML::StructuralFeature" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdGKSVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StructuralFeature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuralFeature"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StructuralFeatureAction" identifier="org.eclipse.papyrus.uml.StructuralFeatureAction" name="UML::StructuralFeatureAction" hint="UML::StructuralFeatureAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdGKS1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuralFeatureAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StructuredActivityNode" identifier="org.eclipse.papyrus.uml.StructuredActivityNode" name="UML::StructuredActivityNode" hint="UML::StructuredActivityNode" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.StructuredActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdGxQVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredActivityNode"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.StructuredClassifier" identifier="org.eclipse.papyrus.uml.StructuredClassifier" name="UML::StructuredClassifier" hint="UML::StructuredClassifier" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdGxUlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/StructuredClassifier.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//StructuredClassifier"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Substitution" identifier="org.eclipse.papyrus.uml.Substitution" name="UML::Substitution" hint="UML::Substitution" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.SubstitutionEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdGxVFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Substitution"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateBinding" identifier="org.eclipse.papyrus.uml.TemplateBinding" name="UML::TemplateBinding" hint="UML::TemplateBinding" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TemplateBindingEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdHYXFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TemplateBinding.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateBinding"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateParameterBase" identifier="org.eclipse.papyrus.uml.TemplateParameterBase" name="UML::TemplateParameterBase" hint="UML::TemplateParameterBase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdHYXlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateParameter" identifier="org.eclipse.papyrus.uml.TemplateParameter" name="UML::TemplateParameter" hint="UML::TemplateParameter" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.TemplateParameterBase">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_JCgQsZXMEeSmV5hdT3HeBw" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TemplateParameterEditHelperAdvice"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateParameterSubstitution" identifier="org.eclipse.papyrus.uml.TemplateParameterSubstitution" name="UML::TemplateParameterSubstitution" hint="UML::TemplateParameterSubstitution" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdHYYFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TemplateParameterSubstitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameterSubstitution"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateSignature" identifier="org.eclipse.papyrus.uml.TemplateSignature" name="UML::TemplateSignature" hint="UML::TemplateSignature" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdHYYlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateSignature"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TemplateableElement" identifier="org.eclipse.papyrus.uml.TemplateableElement" name="UML::TemplateableElement" hint="UML::TemplateableElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdHYZFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TemplateableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateableElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TestIdentityAction" identifier="org.eclipse.papyrus.uml.TestIdentityAction" name="UML::TestIdentityAction" hint="UML::TestIdentityAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdHYZlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TestIdentityAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TestIdentityAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeConstraint" identifier="org.eclipse.papyrus.uml.TimeConstraint" name="UML::TimeConstraint" hint="UML::TimeConstraint" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TimeConstraintEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdHYblYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeConstraint"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeEvent" identifier="org.eclipse.papyrus.uml.TimeEvent" name="UML::TimeEvent" hint="UML::TimeEvent" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdH_eVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TimeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeEvent"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeExpression" identifier="org.eclipse.papyrus.uml.TimeExpression" name="UML::TimeExpression" hint="UML::TimeExpression" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdImcVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TimeExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeExpression"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeInterval" identifier="org.eclipse.papyrus.uml.TimeInterval" name="UML::TimeInterval" hint="UML::TimeInterval" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdJNk1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TimeInterval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeInterval"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeObservation" identifier="org.eclipse.papyrus.uml.TimeObservation" name="UML::TimeObservation" hint="UML::TimeObservation" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ObservationEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdKbv1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TimeObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TimeObservation"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TimeObservation.Event" identifier="org.eclipse.papyrus.uml.TimeObservation.Event" name="UML::TimeObservation::Event" hint="UML::TimeObservation::Event" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_CQre4FWtEeeGFsmbOwBrhg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TimeObservationEventEditHelperAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Transition" identifier="org.eclipse.papyrus.uml.Transition" name="UML::Transition" hint="UML::Transition" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.TransitionEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdLCtlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Transition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Transition"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Trigger" identifier="org.eclipse.papyrus.uml.Trigger" name="UML::Trigger" hint="UML::Trigger" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdLCuFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Trigger.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Trigger"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Type" identifier="org.eclipse.papyrus.uml.Type" name="UML::Type" hint="UML::Type" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdLCulYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Type.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Type"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.TypedElement" identifier="org.eclipse.papyrus.uml.TypedElement" name="UML::TypedElement" hint="UML::TypedElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdLCvFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/TypedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//TypedElement"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.UnmarshallAction" identifier="org.eclipse.papyrus.uml.UnmarshallAction" name="UML::UnmarshallAction" hint="UML::UnmarshallAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdLCvlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/UnmarshallAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//UnmarshallAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Usage" identifier="org.eclipse.papyrus.uml.Usage" name="UML::Usage" hint="UML::Usage" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.DependencyEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdLCxlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Usage"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.UseCase" identifier="org.eclipse.papyrus.uml.UseCase" name="UML::UseCase" hint="UML::UseCase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.UseCaseEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdLCzlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//UseCase"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValuePin" identifier="org.eclipse.papyrus.uml.ValuePin" name="UML::ValuePin" hint="UML::ValuePin" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdLp2FYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValueSpecification" identifier="org.eclipse.papyrus.uml.ValueSpecification" name="UML::ValueSpecification" hint="UML::ValueSpecification" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdM4AFYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ValueSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecification"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.ValueSpecificationAction" identifier="org.eclipse.papyrus.uml.ValueSpecificationAction" name="UML::ValueSpecificationAction" hint="UML::ValueSpecificationAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdM4AlYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/ValueSpecificationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//ValueSpecificationAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Variable" identifier="org.eclipse.papyrus.uml.Variable" name="UML::Variable" hint="UML::Variable" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdNe8VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Variable.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Variable"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.VariableAction" identifier="org.eclipse.papyrus.uml.VariableAction" name="UML::VariableAction" hint="UML::VariableAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdNe81YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/VariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//VariableAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Vertex" identifier="org.eclipse.papyrus.uml.Vertex" name="UML::Vertex" hint="UML::Vertex" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ElementEditHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdNe-1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/Vertex.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Vertex"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.WriteLinkAction" identifier="org.eclipse.papyrus.uml.WriteLinkAction" name="UML::WriteLinkAction" hint="UML::WriteLinkAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdNe_VYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/WriteLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteLinkAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.WriteStructuralFeatureAction" identifier="org.eclipse.papyrus.uml.WriteStructuralFeatureAction" name="UML::WriteStructuralFeatureAction" hint="UML::WriteStructuralFeatureAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdNe_1YCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/WriteStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteStructuralFeatureAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.WriteVariableAction" identifier="org.eclipse.papyrus.uml.WriteVariableAction" name="UML::WriteVariableAction" hint="UML::WriteVariableAction" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" editHelperClassName="org.eclipse.papyrus.uml.service.types.helper.ActivityNodeHelper">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_SdNfAVYCEeS0WsAAtVmToA" iconPath="/icons/full/obj16/WriteVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <eClass xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//WriteVariableAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Trace" identifier="org.eclipse.papyrus.uml.Trace" name="UML::Trace" hint="UML::Trace" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Abstraction">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_QcxB0AO0EeWv4ca2-olBmg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_JPmakWskEeSELtwF_9-6fg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TraceEditHelperAdvice"/>
+    <matcherConfiguration xmi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_LDOUUGskEeSELtwF_9-6fg" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.TraceMatcher"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Refine" identifier="org.eclipse.papyrus.uml.Refine" name="UML::Refine" hint="UML::Refine" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.uml.Abstraction">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_N0U_8AO0EeWv4ca2-olBmg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_UGdZ8WslEeSELtwF_9-6fg" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.RefineEditHelperAdvice"/>
+    <matcherConfiguration xmi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_UGdZ8mslEeSELtwF_9-6fg" matcherClassName="org.eclipse.papyrus.uml.service.types.matcher.RefineMatcher"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.uml.Element.OwnedElement" description="Created to support the ContainmentLink" identifier="org.eclipse.papyrus.uml.Element.OwnedElement" name="UML::Element::OwnedElement" hint="UML::Element::OwnedElement" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_JdUX4MHTEeSpuJnfbRdiWQ" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementOwnedElementEditHelperAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  </elementTypeConfigurations>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_wayS0BgzEeaW-4uSpAcmpQ" identifier="org.eclipse.papyrus.uml.advice.ConstraintDestroyConstrainedElements" target="org.eclipse.papyrus.uml.Constraint" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintDestroyConstrainedElementsEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_pSKXgBa4EeaJFJ1Mo_kk8w" identifier="org.eclipse.papyrus.uml.advice.CommentDestroyAnnotatedElements" target="org.eclipse.papyrus.uml.Comment" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentDestroyAnnotatedElementsEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_mqX8YMHdEeSpuJnfbRdiWQ" identifier="org.eclipse.papyrus.uml.advice.Containment" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementOwnedElementReorientEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_6AWx0MJaEeSl6M4_Zhyt7Q" identifier="org.eclipse.papyrus.uml.advice.ConstraintConstrainedElementsReorient" target="org.eclipse.papyrus.uml.Constraint" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintConstrainedElementsReorientEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Biw5sMdFEeS1POoqrCEMrQ" description="" identifier="org.eclipse.papyrus.uml.advice.CommentAnnotatedElementsReorient" target="org.eclipse.papyrus.uml.Comment" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CommentAnnotatedElementsReorientEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_6RSpMEUTEeeiG9SnzxhgUQ" description="" identifier="org.eclipse.papyrus.uml.advice.StereotypePropertyReferenceReorientEditHelperAdvice" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypePropertyReferenceReorientEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_ID_7oFWdEee8aO8EwpogNQ" description="Helper advice on ojbect to delete reference view at stereotype reference changes" identifier="org.eclipse.papyrus.uml.advice.StereotypePropertyReferenceSetEditHelperAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypePropertyReferenceSetEditHelperAdvice">
+    <target xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#org.eclipse.papyrus.infra.emf.page"/>
   </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Xzwb0Ed1EeeUmcF0Apljjw" identifier="org.eclipse.papyrus.uml.advice.StereotypePropertyReferenceDestroyEditHelperAdvice" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypePropertyReferenceDestroyEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_UdTKsMJbEeSl6M4_Zhyt7Q" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextReorient" target="org.eclipse.papyrus.uml.Constraint" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextReorientEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_PBjP4BM9EeW4hZNFQ_NOtQ" description="" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextDestroyEditHelperAdvice" target="org.eclipse.papyrus.uml.Constraint" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextDestroyEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDcWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Classifier" target="org.eclipse.papyrus.uml.Classifier" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDcmT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Collaboration" target="org.eclipse.papyrus.uml.Collaboration" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDc2T7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.CollaborationUse" target="org.eclipse.papyrus.uml.CollaborationUse" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationUseHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDdGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Connector" target="org.eclipse.papyrus.uml.Connector" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDdWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.ConnectorEnd" target="org.eclipse.papyrus.uml.ConnectorEnd" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorEndHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqgGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.EncapsulatedClassifier" target="org.eclipse.papyrus.uml.EncapsulatedClassifier" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.EncapsulatedClassifierHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqgWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.ExecutionSpecification" target="org.eclipse.papyrus.uml.ExecutionSpecification" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ExecutionSpecificationHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqg2T7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Lifeline" target="org.eclipse.papyrus.uml.Lifeline" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.LifelineHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqhGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Message" target="org.eclipse.papyrus.uml.Message" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.MessageHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqhWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.MessageEnd" target="org.eclipse.papyrus.uml.MessageEnd" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.MessageEndHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqhmT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.NamedElement" target="org.eclipse.papyrus.uml.NamedElement" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqh2T7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.NamedElementNameInitializer" target="org.eclipse.papyrus.uml.NamedElement" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementInitializerHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqiGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.OccurrenceSpecification" target="org.eclipse.papyrus.uml.OccurrenceSpecification" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.OccurrenceSpecificationHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqiWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Parameter" target="org.eclipse.papyrus.uml.Parameter" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ParameterHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqimT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.PartDecomposition" target="org.eclipse.papyrus.uml.PartDecomposition" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PartDecompositionHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqi2T7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Property" target="org.eclipse.papyrus.uml.Property" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqjGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.StructuredClassifier" target="org.eclipse.papyrus.uml.StructuredClassifier" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StructuredClassifierHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqjWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.ActivityNode" target="org.eclipse.papyrus.uml.ActivityNode" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ActivityNodeHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqjmT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.ActivityGroup" target="org.eclipse.papyrus.uml.ActivityGroup" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ActivityGroupEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_yHsHwOg-EeSqZs7o0maBIQ" description="Advice for stereotype applications, primarily supplying them as dependents in the destruction of their base element." identifier="org.eclipse.papyrus.uml.advice.StereotypeApplication" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypeApplicationAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_OGm-gAR_EeWEmNqzWv7tuw" identifier="org.eclipse.papyrus.uml.advice.TemplateableElement" target="org.eclipse.papyrus.uml.TemplateableElement" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TemplateableElementEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_hjfH8DCzEeWM9ILC16rEvw" description="Advice that tweaks requests to provide hints to the read-only advice" identifier="org.eclipse.papyrus.uml.advice.UMLReadOnlyHints" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UMLReadOnlyHintsAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_SJGO0DWbEeWdwYNHBiYLiA" identifier="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice_CommunicationPath" target="org.eclipse.papyrus.uml.CommunicationPath" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_5LsYQNckEeaJs5X9XldAaw" description="Advice to delete all incoming and outing transitions with a vertex." identifier="org.eclipse.papyrus.uml.service.types.helper.advice.VertexEditHelperAdvice" target="org.eclipse.papyrus.uml.Vertex" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.VertexEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_1YQLYJnlEeaOSo9ZcaKRYA" description="This advice add automatically the constrained element (occurrence specification) for a time constraint " identifier="org.eclipse.papyrus.uml.service.types.helper.advice.TimeConstraintHelperAdvice" target="org.eclipse.papyrus.uml.TimeConstraint" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TimeConstraintHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Biq00Ks0Eear0ZssjsCjIQ" description="This advice add automatically the event in before and after" identifier="org.eclipse.papyrus.uml.service.types.helper.advice.GeneralOrderingHelperAdvice" target="org.eclipse.papyrus.uml.GeneralOrdering" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.GeneralOrderingHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_sk_AgANEEeeK2pILzAGx9w" identifier="org.eclipse.papyrus.uml.advice.Element" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_pUAxYDKLEee2hdQGBOZDMQ" identifier="org.eclipse.papyrus.uml.advice.DurationConstraint" target="org.eclipse.papyrus.uml.DurationConstraint" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.DurationConstraintEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_RDj3kHOtEeer__BSotNaQg" identifier="org.eclipse.papyrus.uml.advice.CombinedFragment" target="org.eclipse.papyrus.uml.CombinedFragment" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CombinedFragmentEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_U6DhsETXEeimO7ZhVBpjkg" identifier="org.eclipse.papyrus.uml.advice.InteractionOperand" target="org.eclipse.papyrus.uml.InteractionOperand" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InteractionOperandEditHelperAdvice"/>
-  <adviceBindingsConfigurations xsi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_VVC0kETXEeimO7ZhVBpjkg" identifier="org.eclipse.papyrus.uml.advice.Interaction" target="org.eclipse.papyrus.uml.Interaction" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InteractionFragmentContainerEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Xzwb0Ed1EeeUmcF0Apljjw" identifier="org.eclipse.papyrus.uml.advice.StereotypePropertyReferenceDestroyEditHelperAdvice" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypePropertyReferenceDestroyEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_UdTKsMJbEeSl6M4_Zhyt7Q" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextReorient" target="org.eclipse.papyrus.uml.Constraint" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextReorientEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_PBjP4BM9EeW4hZNFQ_NOtQ" description="" identifier="org.eclipse.papyrus.uml.advice.ConstraintContextDestroyEditHelperAdvice" target="org.eclipse.papyrus.uml.Constraint" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConstraintContextDestroyEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDcWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Classifier" target="org.eclipse.papyrus.uml.Classifier" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ClassifierHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDcmT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Collaboration" target="org.eclipse.papyrus.uml.Collaboration" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDc2T7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.CollaborationUse" target="org.eclipse.papyrus.uml.CollaborationUse" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CollaborationUseHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDdGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Connector" target="org.eclipse.papyrus.uml.Connector" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pDdWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.ConnectorEnd" target="org.eclipse.papyrus.uml.ConnectorEnd" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ConnectorEndHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqgGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.EncapsulatedClassifier" target="org.eclipse.papyrus.uml.EncapsulatedClassifier" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.EncapsulatedClassifierHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqgWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.ExecutionSpecification" target="org.eclipse.papyrus.uml.ExecutionSpecification" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ExecutionSpecificationHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqg2T7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Lifeline" target="org.eclipse.papyrus.uml.Lifeline" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.LifelineHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqhGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Message" target="org.eclipse.papyrus.uml.Message" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.MessageHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqhWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.MessageEnd" target="org.eclipse.papyrus.uml.MessageEnd" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.MessageEndHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqhmT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.NamedElement" target="org.eclipse.papyrus.uml.NamedElement" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqh2T7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.NamedElementNameInitializer" target="org.eclipse.papyrus.uml.NamedElement" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.NamedElementInitializerHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqiGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.OccurrenceSpecification" target="org.eclipse.papyrus.uml.OccurrenceSpecification" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.OccurrenceSpecificationHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqiWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Parameter" target="org.eclipse.papyrus.uml.Parameter" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ParameterHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqimT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.PartDecomposition" target="org.eclipse.papyrus.uml.PartDecomposition" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PartDecompositionHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqi2T7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.Property" target="org.eclipse.papyrus.uml.Property" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.PropertyHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqjGT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.StructuredClassifier" target="org.eclipse.papyrus.uml.StructuredClassifier" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StructuredClassifierHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqjWT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.ActivityNode" target="org.eclipse.papyrus.uml.ActivityNode" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ActivityNodeHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_R_pqjmT7EeSzFvTXGJPhUg" identifier="org.eclipse.papyrus.uml.advice.ActivityGroup" target="org.eclipse.papyrus.uml.ActivityGroup" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ActivityGroupEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_yHsHwOg-EeSqZs7o0maBIQ" description="Advice for stereotype applications, primarily supplying them as dependents in the destruction of their base element." identifier="org.eclipse.papyrus.uml.advice.StereotypeApplication" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.StereotypeApplicationAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_OGm-gAR_EeWEmNqzWv7tuw" identifier="org.eclipse.papyrus.uml.advice.TemplateableElement" target="org.eclipse.papyrus.uml.TemplateableElement" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TemplateableElementEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_hjfH8DCzEeWM9ILC16rEvw" description="Advice that tweaks requests to provide hints to the read-only advice" identifier="org.eclipse.papyrus.uml.advice.UMLReadOnlyHints" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.UMLReadOnlyHintsAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_SJGO0DWbEeWdwYNHBiYLiA" identifier="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice_CommunicationPath" target="org.eclipse.papyrus.uml.CommunicationPath" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.AssociationEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_5LsYQNckEeaJs5X9XldAaw" description="Advice to delete all incoming and outing transitions with a vertex." identifier="org.eclipse.papyrus.uml.service.types.helper.advice.VertexEditHelperAdvice" target="org.eclipse.papyrus.uml.Vertex" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.VertexEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_1YQLYJnlEeaOSo9ZcaKRYA" description="This advice add automatically the constrained element (occurrence specification) for a time constraint " identifier="org.eclipse.papyrus.uml.service.types.helper.advice.TimeConstraintHelperAdvice" target="org.eclipse.papyrus.uml.TimeConstraint" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.TimeConstraintHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_Biq00Ks0Eear0ZssjsCjIQ" description="This advice add automatically the event in before and after" identifier="org.eclipse.papyrus.uml.service.types.helper.advice.GeneralOrderingHelperAdvice" target="org.eclipse.papyrus.uml.GeneralOrdering" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.GeneralOrderingHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_sk_AgANEEeeK2pILzAGx9w" identifier="org.eclipse.papyrus.uml.advice.Element" target="org.eclipse.papyrus.uml.Element" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.ElementHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_pUAxYDKLEee2hdQGBOZDMQ" identifier="org.eclipse.papyrus.uml.advice.DurationConstraint" target="org.eclipse.papyrus.uml.DurationConstraint" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.DurationConstraintEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_RDj3kHOtEeer__BSotNaQg" identifier="org.eclipse.papyrus.uml.advice.CombinedFragment" target="org.eclipse.papyrus.uml.CombinedFragment" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.CombinedFragmentEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_U6DhsETXEeimO7ZhVBpjkg" identifier="org.eclipse.papyrus.uml.advice.InteractionOperand" target="org.eclipse.papyrus.uml.InteractionOperand" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InteractionOperandEditHelperAdvice"/>
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_VVC0kETXEeimO7ZhVBpjkg" identifier="org.eclipse.papyrus.uml.advice.Interaction" target="org.eclipse.papyrus.uml.Interaction" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.uml.service.types.helper.advice.InteractionFragmentContainerEditHelperAdvice"/>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations
index c6978dacdd5..48295fcf7c9 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations
@@ -1,3409 +1,3290 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.umldi.service.types.UMLDIElementTypeSet" name="UMLDIElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Abstraction_Edge" identifier="org.eclipse.papyrus.umldi.Abstraction_Edge" name="Abstraction Edge" hint="Abstraction_Edge">
-    <iconEntry xmi:id="_sWEXUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_ScP1oFYCEeS0WsAAtVmToA" identifier="org.eclipse.papyrus.umldi.service.types.UMLDIElementTypeSet" name="UMLDIElementTypeSet" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Abstraction_Edge" identifier="org.eclipse.papyrus.umldi.Abstraction_Edge" name="Abstraction Edge" hint="Abstraction_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWEXUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Abstraction_Shape" identifier="org.eclipse.papyrus.umldi.Abstraction_Shape" name="Abstraction Shape" hint="Abstraction_Shape">
-    <iconEntry xmi:id="_rzFmENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Abstraction_Shape" identifier="org.eclipse.papyrus.umldi.Abstraction_Shape" name="Abstraction Shape" hint="Abstraction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzFmENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Abstraction_Shape_CN" identifier="org.eclipse.papyrus.umldi.Abstraction_Shape_CN" name="Abstraction Shape CN" hint="Abstraction_Shape_CN">
-    <iconEntry xmi:id="_r5oS8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Abstraction_Shape_CN" identifier="org.eclipse.papyrus.umldi.Abstraction_Shape_CN" name="Abstraction Shape CN" hint="Abstraction_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5oS8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Abstraction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AcceptCallAction_Shape" identifier="org.eclipse.papyrus.umldi.AcceptCallAction_Shape" name="Accept Call Action Shape" hint="AcceptCallAction_Shape">
-    <iconEntry xmi:id="_r2A-QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AcceptCallAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AcceptCallAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AcceptCallAction_Shape" identifier="org.eclipse.papyrus.umldi.AcceptCallAction_Shape" name="Accept Call Action Shape" hint="AcceptCallAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2A-QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AcceptCallAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AcceptCallAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AcceptEventAction_Shape" identifier="org.eclipse.papyrus.umldi.AcceptEventAction_Shape" name="Accept Event Action Shape" hint="AcceptEventAction_Shape">
-    <iconEntry xmi:id="_r15CcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AcceptEventAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AcceptEventAction_Shape" identifier="org.eclipse.papyrus.umldi.AcceptEventAction_Shape" name="Accept Event Action Shape" hint="AcceptEventAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r15CcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AcceptEventAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.ActionExecutionSpecification_Shape" identifier="org.eclipse.papyrus.umldi.ActionExecutionSpecification_Shape" name="Action Execution Specification Shape" hint="ActionExecutionSpecification_Shape">
-    <iconEntry xmi:id="_r0O1kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionExecutionSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionExecutionSpecification_Shape" identifier="org.eclipse.papyrus.umldi.ActionExecutionSpecification_Shape" name="Action Execution Specification Shape" hint="ActionExecutionSpecification_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0O1kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionExecutionSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionExecutionSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.ActionExecutionSpecification_Shape_CN" name="Action Execution Specification Shape CN" hint="ActionExecutionSpecification_Shape_CN">
-    <iconEntry xmi:id="_r7QDkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionExecutionSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionExecutionSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.ActionExecutionSpecification_Shape_CN" name="Action Execution Specification Shape CN" hint="ActionExecutionSpecification_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7QDkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionExecutionSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AcceptCallActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AcceptCallActionInputShape" name="Action Input Pin Accept Call Action Input Shape" hint="ActionInputPin_AcceptCallActionInputShape">
-    <iconEntry xmi:id="_sKmHINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AcceptCallActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AcceptCallActionInputShape" name="Action Input Pin Accept Call Action Input Shape" hint="ActionInputPin_AcceptCallActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKmHINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AcceptEventActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AcceptEventActionInputShape" name="Action Input Pin Accept Event Action Input Shape" hint="ActionInputPin_AcceptEventActionInputShape">
-    <iconEntry xmi:id="_sIxiMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AcceptEventActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AcceptEventActionInputShape" name="Action Input Pin Accept Event Action Input Shape" hint="ActionInputPin_AcceptEventActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIxiMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionInputShape" name="Action Input Pin Add Structural Feature Value Action Input Shape" hint="ActionInputPin_AddStructuralFeatureValueActionInputShape">
-    <iconEntry xmi:id="_sNCXINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionInputShape" name="Action Input Pin Add Structural Feature Value Action Input Shape" hint="ActionInputPin_AddStructuralFeatureValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNCXINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionInsertAtShape" name="Action Input Pin Add Structural Feature Value Action Insert At Shape" hint="ActionInputPin_AddStructuralFeatureValueActionInsertAtShape">
-    <iconEntry xmi:id="_sMpVkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionInsertAtShape" name="Action Input Pin Add Structural Feature Value Action Insert At Shape" hint="ActionInputPin_AddStructuralFeatureValueActionInsertAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMpVkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::insertAt"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionObjectShape" name="Action Input Pin Add Structural Feature Value Action Object Shape" hint="ActionInputPin_AddStructuralFeatureValueActionObjectShape">
-    <iconEntry xmi:id="_sM6bUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionObjectShape" name="Action Input Pin Add Structural Feature Value Action Object Shape" hint="ActionInputPin_AddStructuralFeatureValueActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sM6bUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionValueShape" name="Action Input Pin Add Structural Feature Value Action Value Shape" hint="ActionInputPin_AddStructuralFeatureValueActionValueShape">
-    <iconEntry xmi:id="_sMx4cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddStructuralFeatureValueActionValueShape" name="Action Input Pin Add Structural Feature Value Action Value Shape" hint="ActionInputPin_AddStructuralFeatureValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMx4cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddStructuralFeatureValueAction::value"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionInputShape" name="Action Input Pin Add Variable Value Action Input Shape" hint="ActionInputPin_AddVariableValueActionInputShape">
-    <iconEntry xmi:id="_sPktwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionInputShape" name="Action Input Pin Add Variable Value Action Input Shape" hint="ActionInputPin_AddVariableValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPktwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionInsertAtShape" name="Action Input Pin Add Variable Value Action Insert At Shape" hint="ActionInputPin_AddVariableValueActionInsertAtShape">
-    <iconEntry xmi:id="_sPTA8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionInsertAtShape" name="Action Input Pin Add Variable Value Action Insert At Shape" hint="ActionInputPin_AddVariableValueActionInsertAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPTA8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::AddVariableValueAction::insertAt"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionValueShape" name="Action Input Pin Add Variable Value Action Value Shape" hint="ActionInputPin_AddVariableValueActionValueShape">
-    <iconEntry xmi:id="_sPbj0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_AddVariableValueActionValueShape" name="Action Input Pin Add Variable Value Action Value Shape" hint="ActionInputPin_AddVariableValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPbj0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_BroadcastSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_BroadcastSignalActionArgumentShape" name="Action Input Pin Broadcast Signal Action Argument Shape" hint="ActionInputPin_BroadcastSignalActionArgumentShape">
-    <iconEntry xmi:id="_sLXjMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_BroadcastSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_BroadcastSignalActionArgumentShape" name="Action Input Pin Broadcast Signal Action Argument Shape" hint="ActionInputPin_BroadcastSignalActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLXjMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_BroadcastSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_BroadcastSignalActionInputShape" name="Action Input Pin Broadcast Signal Action Input Shape" hint="ActionInputPin_BroadcastSignalActionInputShape">
-    <iconEntry xmi:id="_sLgGENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_BroadcastSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_BroadcastSignalActionInputShape" name="Action Input Pin Broadcast Signal Action Input Shape" hint="ActionInputPin_BroadcastSignalActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLgGENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionArgumentShape" name="Action Input Pin Call Behavior Action Argument Shape" hint="ActionInputPin_CallBehaviorActionArgumentShape">
-    <iconEntry xmi:id="_sILFQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionArgumentShape" name="Action Input Pin Call Behavior Action Argument Shape" hint="ActionInputPin_CallBehaviorActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sILFQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionInputShape" name="Action Input Pin Call Behavior Action Input Shape" hint="ActionInputPin_CallBehaviorActionInputShape">
-    <iconEntry xmi:id="_sIToINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionInputShape" name="Action Input Pin Call Behavior Action Input Shape" hint="ActionInputPin_CallBehaviorActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIToINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionArgumentShape" name="Action Input Pin Call Operation Action Argument Shape" hint="ActionInputPin_CallOperationActionArgumentShape">
-    <iconEntry xmi:id="_sJcQkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionArgumentShape" name="Action Input Pin Call Operation Action Argument Shape" hint="ActionInputPin_CallOperationActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJcQkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionInputShape" name="Action Input Pin Call Operation Action Input Shape" hint="ActionInputPin_CallOperationActionInputShape">
-    <iconEntry xmi:id="_sJkzcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionInputShape" name="Action Input Pin Call Operation Action Input Shape" hint="ActionInputPin_CallOperationActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJkzcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionTargetShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionTargetShape" name="Action Input Pin Call Operation Action Target Shape" hint="ActionInputPin_CallOperationActionTargetShape">
-    <iconEntry xmi:id="_sJTtsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionTargetShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionTargetShape" name="Action Input Pin Call Operation Action Target Shape" hint="ActionInputPin_CallOperationActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJTtsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::CallOperationAction::target"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ClearAssociationActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ClearAssociationActionInputShape" name="Action Input Pin Clear Association Action Input Shape" hint="ActionInputPin_ClearAssociationActionInputShape">
-    <iconEntry xmi:id="_sGK6INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ClearAssociationActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ClearAssociationActionInputShape" name="Action Input Pin Clear Association Action Input Shape" hint="ActionInputPin_ClearAssociationActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGK6INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ClearAssociationActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ClearAssociationActionObjectShape" name="Action Input Pin Clear Association Action Object Shape" hint="ActionInputPin_ClearAssociationActionObjectShape">
-    <iconEntry xmi:id="_sGCXQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ClearAssociationActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ClearAssociationActionObjectShape" name="Action Input Pin Clear Association Action Object Shape" hint="ActionInputPin_ClearAssociationActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGCXQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ClearStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ClearStructuralFeatureActionInputShape" name="Action Input Pin Clear Structural Feature Action Input Shape" hint="ActionInputPin_ClearStructuralFeatureActionInputShape">
-    <iconEntry xmi:id="_sOZCANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ClearStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ClearStructuralFeatureActionInputShape" name="Action Input Pin Clear Structural Feature Action Input Shape" hint="ActionInputPin_ClearStructuralFeatureActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOZCANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ClearStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ClearStructuralFeatureActionObjectShape" name="Action Input Pin Clear Structural Feature Action Object Shape" hint="ActionInputPin_ClearStructuralFeatureActionObjectShape">
-    <iconEntry xmi:id="_sOQfINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ClearStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ClearStructuralFeatureActionObjectShape" name="Action Input Pin Clear Structural Feature Action Object Shape" hint="ActionInputPin_ClearStructuralFeatureActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOQfINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ClearVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ClearVariableActionInputShape" name="Action Input Pin Clear Variable Action Input Shape" hint="ActionInputPin_ClearVariableActionInputShape">
-    <iconEntry xmi:id="_sPHawNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ClearVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ClearVariableActionInputShape" name="Action Input Pin Clear Variable Action Input Shape" hint="ActionInputPin_ClearVariableActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPHawNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ConditionalNodeInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ConditionalNodeInputShape" name="Action Input Pin Conditional Node Input Shape" hint="ActionInputPin_ConditionalNodeInputShape">
-    <iconEntry xmi:id="_sIiRoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ConditionalNodeInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ConditionalNodeInputShape" name="Action Input Pin Conditional Node Input Shape" hint="ActionInputPin_ConditionalNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIiRoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkActionInputShape" name="Action Input Pin Create Link Action Input Shape" hint="ActionInputPin_CreateLinkActionInputShape">
-    <iconEntry xmi:id="_sHDD4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkActionInputShape" name="Action Input Pin Create Link Action Input Shape" hint="ActionInputPin_CreateLinkActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHDD4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkObjectActionInputShape" name="Action Input Pin Create Link Object Action Input Shape" hint="ActionInputPin_CreateLinkObjectActionInputShape">
-    <iconEntry xmi:id="_sQxAkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CreateLinkObjectActionInputShape" name="Action Input Pin Create Link Object Action Input Shape" hint="ActionInputPin_CreateLinkObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQxAkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CreateObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CreateObjectActionInputShape" name="Action Input Pin Create Object Action Input Shape" hint="ActionInputPin_CreateObjectActionInputShape">
-    <iconEntry xmi:id="_sQNm8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_CreateObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_CreateObjectActionInputShape" name="Action Input Pin Create Object Action Input Shape" hint="ActionInputPin_CreateObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQNm8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_DestroyLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_DestroyLinkActionInputShape" name="Action Input Pin Destroy Link Action Input Shape" hint="ActionInputPin_DestroyLinkActionInputShape">
-    <iconEntry xmi:id="_sNRAoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_DestroyLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_DestroyLinkActionInputShape" name="Action Input Pin Destroy Link Action Input Shape" hint="ActionInputPin_DestroyLinkActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNRAoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_DestroyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_DestroyObjectActionInputShape" name="Action Input Pin Destroy Object Action Input Shape" hint="ActionInputPin_DestroyObjectActionInputShape">
-    <iconEntry xmi:id="_sOvnUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_DestroyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_DestroyObjectActionInputShape" name="Action Input Pin Destroy Object Action Input Shape" hint="ActionInputPin_DestroyObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOvnUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_DestroyObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_DestroyObjectActionTargetShape" name="Action Input Pin Destroy Object Action Target Shape" hint="ActionInputPin_DestroyObjectActionTargetShape">
-    <iconEntry xmi:id="_sOnrgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_DestroyObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_DestroyObjectActionTargetShape" name="Action Input Pin Destroy Object Action Target Shape" hint="ActionInputPin_DestroyObjectActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOnrgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ExpansionRegionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ExpansionRegionInputShape" name="Action Input Pin Expansion Region Input Shape" hint="ActionInputPin_ExpansionRegionInputShape">
-    <iconEntry xmi:id="_sJzc8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ExpansionRegionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ExpansionRegionInputShape" name="Action Input Pin Expansion Region Input Shape" hint="ActionInputPin_ExpansionRegionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJzc8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_LoopNodeInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_LoopNodeInputShape" name="Action Input Pin Loop Node Input Shape" hint="ActionInputPin_LoopNodeInputShape">
-    <iconEntry xmi:id="_sGrQcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_LoopNodeInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_LoopNodeInputShape" name="Action Input Pin Loop Node Input Shape" hint="ActionInputPin_LoopNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGrQcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_LoopNodeVariableInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_LoopNodeVariableInputShape" name="Action Input Pin Loop Node Variable Input Shape" hint="ActionInputPin_LoopNodeVariableInputShape">
-    <iconEntry xmi:id="_sGitkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_LoopNodeVariableInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_LoopNodeVariableInputShape" name="Action Input Pin Loop Node Variable Input Shape" hint="ActionInputPin_LoopNodeVariableInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGitkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_OpaqueActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_OpaqueActionInputShape" name="Action Input Pin Opaque Action Input Shape" hint="ActionInputPin_OpaqueActionInputShape">
-    <iconEntry xmi:id="_sO70kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_OpaqueActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_OpaqueActionInputShape" name="Action Input Pin Opaque Action Input Shape" hint="ActionInputPin_OpaqueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sO70kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RaiseExceptionActionExceptionShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RaiseExceptionActionExceptionShape" name="Action Input Pin Raise Exception Action Exception Shape" hint="ActionInputPin_RaiseExceptionActionExceptionShape">
-    <iconEntry xmi:id="_sQc3gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RaiseExceptionActionExceptionShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RaiseExceptionActionExceptionShape" name="Action Input Pin Raise Exception Action Exception Shape" hint="ActionInputPin_RaiseExceptionActionExceptionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQc3gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RaiseExceptionActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RaiseExceptionActionInputShape" name="Action Input Pin Raise Exception Action Input Shape" hint="ActionInputPin_RaiseExceptionActionInputShape">
-    <iconEntry xmi:id="_sQkzUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RaiseExceptionActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RaiseExceptionActionInputShape" name="Action Input Pin Raise Exception Action Input Shape" hint="ActionInputPin_RaiseExceptionActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQkzUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadExtentActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadExtentActionInputShape" name="Action Input Pin Read Extent Action Input Shape" hint="ActionInputPin_ReadExtentActionInputShape">
-    <iconEntry xmi:id="_sMasENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadExtentActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadExtentActionInputShape" name="Action Input Pin Read Extent Action Input Shape" hint="ActionInputPin_ReadExtentActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMasENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadIsClassifiedObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadIsClassifiedObjectActionInputShape" name="Action Input Pin Read Is Classified Object Action Input Shape" hint="ActionInputPin_ReadIsClassifiedObjectActionInputShape">
-    <iconEntry xmi:id="_sKWPgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadIsClassifiedObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadIsClassifiedObjectActionInputShape" name="Action Input Pin Read Is Classified Object Action Input Shape" hint="ActionInputPin_ReadIsClassifiedObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKWPgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadIsClassifiedObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadIsClassifiedObjectActionObjectShape" name="Action Input Pin Read Is Classified Object Action Object Shape" hint="ActionInputPin_ReadIsClassifiedObjectActionObjectShape">
-    <iconEntry xmi:id="_sKNsoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadIsClassifiedObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadIsClassifiedObjectActionObjectShape" name="Action Input Pin Read Is Classified Object Action Object Shape" hint="ActionInputPin_ReadIsClassifiedObjectActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKNsoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkActionInputShape" name="Action Input Pin Read Link Action Input Shape" hint="ActionInputPin_ReadLinkActionInputShape">
-    <iconEntry xmi:id="_sE7kANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkActionInputShape" name="Action Input Pin Read Link Action Input Shape" hint="ActionInputPin_ReadLinkActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sE7kANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndActionInputShape" name="Action Input Pin Read Link Object End Action Input Shape" hint="ActionInputPin_ReadLinkObjectEndActionInputShape">
-    <iconEntry xmi:id="_sL1dQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndActionInputShape" name="Action Input Pin Read Link Object End Action Input Shape" hint="ActionInputPin_ReadLinkObjectEndActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sL1dQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndActionObjectShape" name="Action Input Pin Read Link Object End Action Object Shape" hint="ActionInputPin_ReadLinkObjectEndActionObjectShape">
-    <iconEntry xmi:id="_sLsTUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndActionObjectShape" name="Action Input Pin Read Link Object End Action Object Shape" hint="ActionInputPin_ReadLinkObjectEndActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLsTUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndQualifierActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndQualifierActionInputShape" name="Action Input Pin Read Link Object End Qualifier Action Input Shape" hint="ActionInputPin_ReadLinkObjectEndQualifierActionInputShape">
-    <iconEntry xmi:id="_sDy7kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndQualifierActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndQualifierActionInputShape" name="Action Input Pin Read Link Object End Qualifier Action Input Shape" hint="ActionInputPin_ReadLinkObjectEndQualifierActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDy7kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndQualifierActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndQualifierActionObjectShape" name="Action Input Pin Read Link Object End Qualifier Action Object Shape" hint="ActionInputPin_ReadLinkObjectEndQualifierActionObjectShape">
-    <iconEntry xmi:id="_sDqYsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndQualifierActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadLinkObjectEndQualifierActionObjectShape" name="Action Input Pin Read Link Object End Qualifier Action Object Shape" hint="ActionInputPin_ReadLinkObjectEndQualifierActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDqYsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadSelfActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadSelfActionInputShape" name="Action Input Pin Read Self Action Input Shape" hint="ActionInputPin_ReadSelfActionInputShape">
-    <iconEntry xmi:id="_sJ_DINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadSelfActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadSelfActionInputShape" name="Action Input Pin Read Self Action Input Shape" hint="ActionInputPin_ReadSelfActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJ_DINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadStructuralFeatureActionInputShape" name="Action Input Pin Read Structural Feature Action Input Shape" hint="ActionInputPin_ReadStructuralFeatureActionInputShape">
-    <iconEntry xmi:id="_sOB1oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadStructuralFeatureActionInputShape" name="Action Input Pin Read Structural Feature Action Input Shape" hint="ActionInputPin_ReadStructuralFeatureActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOB1oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadStructuralFeatureActionObjectShape" name="Action Input Pin Read Structural Feature Action Object Shape" hint="ActionInputPin_ReadStructuralFeatureActionObjectShape">
-    <iconEntry xmi:id="_sN550Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadStructuralFeatureActionObjectShape" name="Action Input Pin Read Structural Feature Action Object Shape" hint="ActionInputPin_ReadStructuralFeatureActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sN550Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadVariableActionInputShape" name="Action Input Pin Read Variable Action Input Shape" hint="ActionInputPin_ReadVariableActionInputShape">
-    <iconEntry xmi:id="_sPwT8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReadVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReadVariableActionInputShape" name="Action Input Pin Read Variable Action Input Shape" hint="ActionInputPin_ReadVariableActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPwT8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReclassifyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReclassifyObjectActionInputShape" name="Action Input Pin Reclassify Object Action Input Shape" hint="ActionInputPin_ReclassifyObjectActionInputShape">
-    <iconEntry xmi:id="_sH_fENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReclassifyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReclassifyObjectActionInputShape" name="Action Input Pin Reclassify Object Action Input Shape" hint="ActionInputPin_ReclassifyObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sH_fENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReclassifyObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReclassifyObjectActionObjectShape" name="Action Input Pin Reclassify Object Action Object Shape" hint="ActionInputPin_ReclassifyObjectActionObjectShape">
-    <iconEntry xmi:id="_sH3jQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReclassifyObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReclassifyObjectActionObjectShape" name="Action Input Pin Reclassify Object Action Object Shape" hint="ActionInputPin_ReclassifyObjectActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sH3jQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReduceActionCollectionShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReduceActionCollectionShape" name="Action Input Pin Reduce Action Collection Shape" hint="ActionInputPin_ReduceActionCollectionShape">
-    <iconEntry xmi:id="_sFqj0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReduceActionCollectionShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReduceActionCollectionShape" name="Action Input Pin Reduce Action Collection Shape" hint="ActionInputPin_ReduceActionCollectionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFqj0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReduceActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReduceActionInputShape" name="Action Input Pin Reduce Action Input Shape" hint="ActionInputPin_ReduceActionInputShape">
-    <iconEntry xmi:id="_sFzGsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReduceActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReduceActionInputShape" name="Action Input Pin Reduce Action Input Shape" hint="ActionInputPin_ReduceActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFzGsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionInputShape" name="Action Input Pin Remove Structural Feature Value Action Input Shape" hint="ActionInputPin_RemoveStructuralFeatureValueActionInputShape">
-    <iconEntry xmi:id="_sHoSsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionInputShape" name="Action Input Pin Remove Structural Feature Value Action Input Shape" hint="ActionInputPin_RemoveStructuralFeatureValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHoSsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionObjectShape" name="Action Input Pin Remove Structural Feature Value Action Object Shape" hint="ActionInputPin_RemoveStructuralFeatureValueActionObjectShape">
-    <iconEntry xmi:id="_sHfv0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionObjectShape" name="Action Input Pin Remove Structural Feature Value Action Object Shape" hint="ActionInputPin_RemoveStructuralFeatureValueActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHfv0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionRemoveAtShape" name="Action Input Pin Remove Structural Feature Value Action Remove At Shape" hint="ActionInputPin_RemoveStructuralFeatureValueActionRemoveAtShape">
-    <iconEntry xmi:id="_sHPRINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionRemoveAtShape" name="Action Input Pin Remove Structural Feature Value Action Remove At Shape" hint="ActionInputPin_RemoveStructuralFeatureValueActionRemoveAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHPRINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionValueShape" name="Action Input Pin Remove Structural Feature Value Action Value Shape" hint="ActionInputPin_RemoveStructuralFeatureValueActionValueShape">
-    <iconEntry xmi:id="_sHX0ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveStructuralFeatureValueActionValueShape" name="Action Input Pin Remove Structural Feature Value Action Value Shape" hint="ActionInputPin_RemoveStructuralFeatureValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHX0ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionInputShape" name="Action Input Pin Remove Variable Value Action Input Shape" hint="ActionInputPin_RemoveVariableValueActionInputShape">
-    <iconEntry xmi:id="_sFe9oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionInputShape" name="Action Input Pin Remove Variable Value Action Input Shape" hint="ActionInputPin_RemoveVariableValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFe9oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionRemoveAtShape" name="Action Input Pin Remove Variable Value Action Remove At Shape" hint="ActionInputPin_RemoveVariableValueActionRemoveAtShape">
-    <iconEntry xmi:id="_sFN34Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionRemoveAtShape" name="Action Input Pin Remove Variable Value Action Remove At Shape" hint="ActionInputPin_RemoveVariableValueActionRemoveAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFN34Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionValueShape" name="Action Input Pin Remove Variable Value Action Value Shape" hint="ActionInputPin_RemoveVariableValueActionValueShape">
-    <iconEntry xmi:id="_sFWawNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_RemoveVariableValueActionValueShape" name="Action Input Pin Remove Variable Value Action Value Shape" hint="ActionInputPin_RemoveVariableValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFWawNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionInputShape" name="Action Input Pin Reply Action Input Shape" hint="ActionInputPin_ReplyActionInputShape">
-    <iconEntry xmi:id="_sNuToNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionInputShape" name="Action Input Pin Reply Action Input Shape" hint="ActionInputPin_ReplyActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNuToNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionReplyShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionReplyShape" name="Action Input Pin Reply Action Reply Shape" hint="ActionInputPin_ReplyActionReplyShape">
-    <iconEntry xmi:id="_sNdN4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionReplyShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionReplyShape" name="Action Input Pin Reply Action Reply Shape" hint="ActionInputPin_ReplyActionReplyShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNdN4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionReturnShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionReturnShape" name="Action Input Pin Reply Action Return Shape" hint="ActionInputPin_ReplyActionReturnShape">
-    <iconEntry xmi:id="_sNlwwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionReturnShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ReplyActionReturnShape" name="Action Input Pin Reply Action Return Shape" hint="ActionInputPin_ReplyActionReturnShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNlwwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionInputShape" name="Action Input Pin Send Object Action Input Shape" hint="ActionInputPin_SendObjectActionInputShape">
-    <iconEntry xmi:id="_sESq0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionInputShape" name="Action Input Pin Send Object Action Input Shape" hint="ActionInputPin_SendObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sESq0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionRequestShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionRequestShape" name="Action Input Pin Send Object Action Request Shape" hint="ActionInputPin_SendObjectActionRequestShape">
-    <iconEntry xmi:id="_sECMINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionRequestShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionRequestShape" name="Action Input Pin Send Object Action Request Shape" hint="ActionInputPin_SendObjectActionRequestShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sECMINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::object"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionTargetShape" name="Action Input Pin Send Object Action Target Shape" hint="ActionInputPin_SendObjectActionTargetShape">
-    <iconEntry xmi:id="_sEKH8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionTargetShape" name="Action Input Pin Send Object Action Target Shape" hint="ActionInputPin_SendObjectActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEKH8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendObjectAction::request"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionArgumentShape" name="Action Input Pin Send Signal Action Argument Shape" hint="ActionInputPin_SendSignalActionArgumentShape">
-    <iconEntry xmi:id="_sEmz4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionArgumentShape" name="Action Input Pin Send Signal Action Argument Shape" hint="ActionInputPin_SendSignalActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEmz4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionInputShape" name="Action Input Pin Send Signal Action Input Shape" hint="ActionInputPin_SendSignalActionInputShape">
-    <iconEntry xmi:id="_sEvWwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionInputShape" name="Action Input Pin Send Signal Action Input Shape" hint="ActionInputPin_SendSignalActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEvWwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionTargetShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionTargetShape" name="Action Input Pin Send Signal Action Target Shape" hint="ActionInputPin_SendSignalActionTargetShape">
-    <iconEntry xmi:id="_sEeRANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionTargetShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionTargetShape" name="Action Input Pin Send Signal Action Target Shape" hint="ActionInputPin_SendSignalActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEeRANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::SendSignalAction::target"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SequenceNodeInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SequenceNodeInputShape" name="Action Input Pin Sequence Node Input Shape" hint="ActionInputPin_SequenceNodeInputShape">
-    <iconEntry xmi:id="_sGWgUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_SequenceNodeInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_SequenceNodeInputShape" name="Action Input Pin Sequence Node Input Shape" hint="ActionInputPin_SequenceNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGWgUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_Shape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_Shape" name="Action Input Pin Shape" hint="ActionInputPin_Shape">
-    <iconEntry xmi:id="_r2th0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_Shape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_Shape" name="Action Input Pin Shape" hint="ActionInputPin_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2th0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StartClassifierBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StartClassifierBehaviorActionInputShape" name="Action Input Pin Start Classifier Behavior Action Input Shape" hint="ActionInputPin_StartClassifierBehaviorActionInputShape">
-    <iconEntry xmi:id="_sJIHgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StartClassifierBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StartClassifierBehaviorActionInputShape" name="Action Input Pin Start Classifier Behavior Action Input Shape" hint="ActionInputPin_StartClassifierBehaviorActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJIHgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StartClassifierBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StartClassifierBehaviorActionObjectShape" name="Action Input Pin Start Classifier Behavior Action Object Shape" hint="ActionInputPin_StartClassifierBehaviorActionObjectShape">
-    <iconEntry xmi:id="_sI_koNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StartClassifierBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StartClassifierBehaviorActionObjectShape" name="Action Input Pin Start Classifier Behavior Action Object Shape" hint="ActionInputPin_StartClassifierBehaviorActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sI_koNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionArgumentShape" name="Action Input Pin Start Object Behavior Action Argument Shape" hint="ActionInputPin_StartObjectBehaviorActionArgumentShape">
-    <iconEntry xmi:id="_sLAW0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionArgumentShape" name="Action Input Pin Start Object Behavior Action Argument Shape" hint="ActionInputPin_StartObjectBehaviorActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLAW0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionInputShape" name="Action Input Pin Start Object Behavior Action Input Shape" hint="ActionInputPin_StartObjectBehaviorActionInputShape">
-    <iconEntry xmi:id="_sLI5sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionInputShape" name="Action Input Pin Start Object Behavior Action Input Shape" hint="ActionInputPin_StartObjectBehaviorActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLI5sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionObjectShape" name="Action Input Pin Start Object Behavior Action Object Shape" hint="ActionInputPin_StartObjectBehaviorActionObjectShape">
-    <iconEntry xmi:id="_sK3z8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StartObjectBehaviorActionObjectShape" name="Action Input Pin Start Object Behavior Action Object Shape" hint="ActionInputPin_StartObjectBehaviorActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sK3z8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::StartObjectBehaviorAction::object"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StructuredActivityNodeInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StructuredActivityNodeInputShape" name="Action Input Pin Structured Activity Node Input Shape" hint="ActionInputPin_StructuredActivityNodeInputShape">
-    <iconEntry xmi:id="_sDeygNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_StructuredActivityNodeInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_StructuredActivityNodeInputShape" name="Action Input Pin Structured Activity Node Input Shape" hint="ActionInputPin_StructuredActivityNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDeygNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionFirstShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionFirstShape" name="Action Input Pin Test Identity Action First Shape" hint="ActionInputPin_TestIdentityActionFirstShape">
-    <iconEntry xmi:id="_sC3ugNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionFirstShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionFirstShape" name="Action Input Pin Test Identity Action First Shape" hint="ActionInputPin_TestIdentityActionFirstShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sC3ugNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionInputShape" name="Action Input Pin Test Identity Action Input Shape" hint="ActionInputPin_TestIdentityActionInputShape">
-    <iconEntry xmi:id="_sDMeoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionInputShape" name="Action Input Pin Test Identity Action Input Shape" hint="ActionInputPin_TestIdentityActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDMeoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionSecondShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionSecondShape" name="Action Input Pin Test Identity Action Second Shape" hint="ActionInputPin_TestIdentityActionSecondShape">
-    <iconEntry xmi:id="_sDD7wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionSecondShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_TestIdentityActionSecondShape" name="Action Input Pin Test Identity Action Second Shape" hint="ActionInputPin_TestIdentityActionSecondShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDD7wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin_As_UML::TestIdentityAction::second"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_UnmarshallActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_UnmarshallActionInputShape" name="Action Input Pin Unmarshall Action Input Shape" hint="ActionInputPin_UnmarshallActionInputShape">
-    <iconEntry xmi:id="_sMMCkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_UnmarshallActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_UnmarshallActionInputShape" name="Action Input Pin Unmarshall Action Input Shape" hint="ActionInputPin_UnmarshallActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMMCkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_UnmarshallActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_UnmarshallActionObjectShape" name="Action Input Pin Unmarshall Action Object Shape" hint="ActionInputPin_UnmarshallActionObjectShape">
-    <iconEntry xmi:id="_sMDfsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_UnmarshallActionObjectShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_UnmarshallActionObjectShape" name="Action Input Pin Unmarshall Action Object Shape" hint="ActionInputPin_UnmarshallActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMDfsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ValueSpecificationActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ValueSpecificationActionInputShape" name="Action Input Pin Value Specification Action Input Shape" hint="ActionInputPin_ValueSpecificationActionInputShape">
-    <iconEntry xmi:id="_sP-9cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActionInputPin_ValueSpecificationActionInputShape" identifier="org.eclipse.papyrus.umldi.ActionInputPin_ValueSpecificationActionInputShape" name="Action Input Pin Value Specification Action Input Shape" hint="ActionInputPin_ValueSpecificationActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sP-9cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActionInputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActionInputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Action_LocalPostconditionEdge" identifier="org.eclipse.papyrus.umldi.Action_LocalPostconditionEdge" name="Action Local Postcondition Edge" hint="Action_LocalPostconditionEdge">
-    <iconEntry xmi:id="_sYHlwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Action.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Action_LocalPostconditionEdge" identifier="org.eclipse.papyrus.umldi.Action_LocalPostconditionEdge" name="Action Local Postcondition Edge" hint="Action_LocalPostconditionEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYHlwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Action.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Action_LocalPreconditionEdge" identifier="org.eclipse.papyrus.umldi.Action_LocalPreconditionEdge" name="Action Local Precondition Edge" hint="Action_LocalPreconditionEdge">
-    <iconEntry xmi:id="_sYCGMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Action.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Action_LocalPreconditionEdge" identifier="org.eclipse.papyrus.umldi.Action_LocalPreconditionEdge" name="Action Local Precondition Edge" hint="Action_LocalPreconditionEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYCGMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Action.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActivityFinalNode_Shape" identifier="org.eclipse.papyrus.umldi.ActivityFinalNode_Shape" name="Activity Final Node Shape" hint="ActivityFinalNode_Shape">
-    <iconEntry xmi:id="_r1SlgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActivityFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityFinalNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActivityFinalNode_Shape" identifier="org.eclipse.papyrus.umldi.ActivityFinalNode_Shape" name="Activity Final Node Shape" hint="ActivityFinalNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1SlgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActivityFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityFinalNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActivityParameterNode_Shape" identifier="org.eclipse.papyrus.umldi.ActivityParameterNode_Shape" name="Activity Parameter Node Shape" hint="ActivityParameterNode_Shape">
-    <iconEntry xmi:id="_rzxikNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActivityParameterNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityParameterNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActivityParameterNode_Shape" identifier="org.eclipse.papyrus.umldi.ActivityParameterNode_Shape" name="Activity Parameter Node Shape" hint="ActivityParameterNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzxikNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActivityParameterNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityParameterNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActivityPartition_Shape" identifier="org.eclipse.papyrus.umldi.ActivityPartition_Shape" name="Activity Partition Shape" hint="ActivityPartition_Shape">
-    <iconEntry xmi:id="_rzCiwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityPartition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActivityPartition_Shape" identifier="org.eclipse.papyrus.umldi.ActivityPartition_Shape" name="Activity Partition Shape" hint="ActivityPartition_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzCiwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.ActivityPartition_Shape_CN" identifier="org.eclipse.papyrus.umldi.ActivityPartition_Shape_CN" name="Activity Partition Shape CN" hint="ActivityPartition_Shape_CN">
-    <iconEntry xmi:id="_r5l2sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ActivityPartition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ActivityPartition_Shape_CN" identifier="org.eclipse.papyrus.umldi.ActivityPartition_Shape_CN" name="Activity Partition Shape CN" hint="ActivityPartition_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5l2sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ActivityPartition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Activity_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Activity_ClassNestedClassifierLabel" name="Activity Class Nested Classifier Label" hint="Activity_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_seHgENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Activity_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Activity_ClassNestedClassifierLabel" name="Activity Class Nested Classifier Label" hint="Activity_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Activity_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seHgENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Activity_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Activity_ComponentNestedClassifierLabel" name="Activity Component Nested Classifier Label" hint="Activity_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_seKjYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Activity_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Activity_ComponentNestedClassifierLabel" name="Activity Component Nested Classifier Label" hint="Activity_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Activity_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seKjYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Activity_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Activity_InterfaceNestedClassifierLabel" name="Activity Interface Nested Classifier Label" hint="Activity_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_seM_oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Activity_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Activity_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Activity_InterfaceNestedClassifierLabel" name="Activity Interface Nested Classifier Label" hint="Activity_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Activity_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seM_oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Activity_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Activity_NestedClassifierLabel" name="Activity Nested Classifier Label" hint="Activity_NestedClassifierLabel">
-    <iconEntry xmi:id="_seEcwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Activity"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Activity_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Activity_NestedClassifierLabel" name="Activity Nested Classifier Label" hint="Activity_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seEcwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Activity_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Activity_OwnedBehaviorLabel" name="Activity Owned Behavior Label" hint="Activity_OwnedBehaviorLabel">
-    <iconEntry xmi:id="_sjyDMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Activity"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Activity_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Activity_OwnedBehaviorLabel" name="Activity Owned Behavior Label" hint="Activity_OwnedBehaviorLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sjyDMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Activity_Shape" identifier="org.eclipse.papyrus.umldi.Activity_Shape" name="Activity Shape" hint="Activity_Shape">
-    <iconEntry xmi:id="_r3NRENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Activity"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Activity_Shape" identifier="org.eclipse.papyrus.umldi.Activity_Shape" name="Activity Shape" hint="Activity_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3NRENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Activity_Shape_CN" identifier="org.eclipse.papyrus.umldi.Activity_Shape_CN" name="Activity Shape CN" hint="Activity_Shape_CN">
-    <iconEntry xmi:id="_r66FUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Activity"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Activity_Shape_CN" identifier="org.eclipse.papyrus.umldi.Activity_Shape_CN" name="Activity Shape CN" hint="Activity_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r66FUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Activity.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Actor_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Actor_ClassNestedClassifierLabel" name="Actor Class Nested Classifier Label" hint="Actor_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_scg9kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Actor_ClassNestedClassifierLabel" name="Actor Class Nested Classifier Label" hint="Actor_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Actor_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scg9kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_ClassifierShape" identifier="org.eclipse.papyrus.umldi.Actor_ClassifierShape" name="Actor Classifier Shape" hint="Actor_ClassifierShape">
-    <iconEntry xmi:id="_r8vRUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_ClassifierShape" identifier="org.eclipse.papyrus.umldi.Actor_ClassifierShape" name="Actor Classifier Shape" hint="Actor_ClassifierShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8vRUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Actor_ComponentNestedClassifierLabel" name="Actor Component Nested Classifier Label" hint="Actor_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sckA4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Actor_ComponentNestedClassifierLabel" name="Actor Component Nested Classifier Label" hint="Actor_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Actor_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sckA4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Actor_InterfaceNestedClassifierLabel" name="Actor Interface Nested Classifier Label" hint="Actor_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_scnEMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Actor_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Actor_InterfaceNestedClassifierLabel" name="Actor Interface Nested Classifier Label" hint="Actor_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Actor_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scnEMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Actor_NestedClassifierLabel" name="Actor Nested Classifier Label" hint="Actor_NestedClassifierLabel">
-    <iconEntry xmi:id="_scehUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Actor_NestedClassifierLabel" name="Actor Nested Classifier Label" hint="Actor_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scehUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_Shape" identifier="org.eclipse.papyrus.umldi.Actor_Shape" name="Actor Shape" hint="Actor_Shape">
-    <iconEntry xmi:id="_r1HmYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_Shape" identifier="org.eclipse.papyrus.umldi.Actor_Shape" name="Actor Shape" hint="Actor_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1HmYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Actor_Shape_CCN" name="Actor Shape CCN" hint="Actor_Shape_CCN">
-    <iconEntry xmi:id="_r-m5kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Actor_Shape_CCN" name="Actor Shape CCN" hint="Actor_Shape_CCN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-m5kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_Shape_CN" identifier="org.eclipse.papyrus.umldi.Actor_Shape_CN" name="Actor Shape CN" hint="Actor_Shape_CN">
-    <iconEntry xmi:id="_r7_qcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AddStructuralFeatureValueAction_Shape" identifier="org.eclipse.papyrus.umldi.AddStructuralFeatureValueAction_Shape" name="Add Structural Feature Value Action Shape" hint="AddStructuralFeatureValueAction_Shape">
-    <iconEntry xmi:id="_r1EjENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AddStructuralFeatureValueAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AddVariableValueAction_Shape" identifier="org.eclipse.papyrus.umldi.AddVariableValueAction_Shape" name="Add Variable Value Action Shape" hint="AddVariableValueAction_Shape">
-    <iconEntry xmi:id="_r4j78Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AddVariableValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AddVariableValueAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AnyReceiveEvent_Shape" identifier="org.eclipse.papyrus.umldi.AnyReceiveEvent_Shape" name="Any Receive Event Shape" hint="AnyReceiveEvent_Shape">
-    <iconEntry xmi:id="_r_-ykNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AnyReceiveEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AnyReceiveEvent"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Artifact_ClassNestedClassifierLabel" name="Artifact Class Nested Classifier Label" hint="Artifact_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_scsjwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_NestedClassifierLabel"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Artifact_ComponentNestedClassifierLabel" name="Artifact Component Nested Classifier Label" hint="Artifact_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_scvnENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_NestedClassifierLabel"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_DeployedArtifactLabel" identifier="org.eclipse.papyrus.umldi.Artifact_DeployedArtifactLabel" name="Artifact Deployed Artifact Label" hint="Artifact_DeployedArtifactLabel">
-    <iconEntry xmi:id="_sijUINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Artifact_InterfaceNestedClassifierLabel" name="Artifact Interface Nested Classifier Label" hint="Artifact_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_scyDUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Artifact_NestedClassifierLabel"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_NestedArtifactLabel" identifier="org.eclipse.papyrus.umldi.Artifact_NestedArtifactLabel" name="Artifact Nested Artifact Label" hint="Artifact_NestedArtifactLabel">
-    <iconEntry xmi:id="_si4EQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Artifact_NestedClassifierLabel" name="Artifact Nested Classifier Label" hint="Artifact_NestedClassifierLabel">
-    <iconEntry xmi:id="_scqHgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_Shape" identifier="org.eclipse.papyrus.umldi.Artifact_Shape" name="Artifact Shape" hint="Artifact_Shape">
-    <iconEntry xmi:id="_r4cAINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_Shape_ACN" identifier="org.eclipse.papyrus.umldi.Artifact_Shape_ACN" name="Artifact Shape_ACN" hint="Artifact_Shape_ACN">
-    <iconEntry xmi:id="_r_gRcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Artifact_Shape_CCN" name="Artifact Shape CCN" hint="Artifact_Shape_CCN">
-    <iconEntry xmi:id="_r_OkoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_Shape_CN" identifier="org.eclipse.papyrus.umldi.Artifact_Shape_CN" name="Artifact Shape CN" hint="Artifact_Shape_CN">
-    <iconEntry xmi:id="_r8NF0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationClass_Edge" identifier="org.eclipse.papyrus.umldi.AssociationClass_Edge" name="Association Class Edge" hint="AssociationClass_Edge">
-    <iconEntry xmi:id="_sWBUANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationClass"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationClass_Shape" identifier="org.eclipse.papyrus.umldi.AssociationClass_Shape" name="Association Class Shape" hint="AssociationClass_Shape">
-    <iconEntry xmi:id="_r0mpANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationClass"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationClass_Shape_CN" identifier="org.eclipse.papyrus.umldi.AssociationClass_Shape_CN" name="Association Class Shape CN" hint="AssociationClass_Shape_CN">
-    <iconEntry xmi:id="_r7svgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationClass"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationClass_TetherEdge" identifier="org.eclipse.papyrus.umldi.AssociationClass_TetherEdge" name="Association Class Tether Edge" hint="AssociationClass_TetherEdge">
-    <iconEntry xmi:id="_sXbCMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Association_BranchEdge" identifier="org.eclipse.papyrus.umldi.Association_BranchEdge" name="Association Branch Edge" hint="Association_BranchEdge">
-    <iconEntry xmi:id="_sW_kYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Association_Edge" identifier="org.eclipse.papyrus.umldi.Association_Edge" name="Association Edge" hint="Association_Edge">
-    <iconEntry xmi:id="_sWw64Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationNonDirected_Edge" identifier="org.eclipse.papyrus.umldi.AssociationNonDirected_Edge" name="AssociationNonDirected Edge" hint="Association_Edge">
-    <iconEntry xmi:id="_ggRYoXhMEee4-vqumSjwzg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationNonDirected"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="#org.eclipse.papyrus.umldi.Association_Edge"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationDirected_Edge" identifier="org.eclipse.papyrus.umldi.AssociationDirected_Edge" name="AssociationDirected Edge" hint="Association_Edge">
-    <iconEntry xmi:id="_Re1vQRR_EeeYdIsxYO_sHQ" iconPath="/icons/Association_none_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationDirected"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="#org.eclipse.papyrus.umldi.Association_Edge"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationComposite_Edge" identifier="org.eclipse.papyrus.umldi.AssociationComposite_Edge" name="AssociationComposite Edge" hint="Association_Edge">
-    <iconEntry xmi:id="_u2LSMxO6EeepH5ph_87ypw" iconPath="/icons/full/obj16/Association_composite.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationComposite"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="#org.eclipse.papyrus.umldi.Association_Edge"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationCompositeDirected_Edge" identifier="org.eclipse.papyrus.umldi.AssociationCompositeDirected_Edge" name="AssociationCompositeDirected Edge" hint="Association_Edge">
-    <iconEntry xmi:id="_Re1vQxR_EeeYdIsxYO_sHQ" iconPath="/icons/Association_composite_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationCompositeDirected"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="#org.eclipse.papyrus.umldi.Association_Edge"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationShared_Edge" identifier="org.eclipse.papyrus.umldi.AssociationShared_Edge" name="AssociationShared Edge" hint="Association_Edge">
-    <iconEntry xmi:id="_u2LSNRO6EeepH5ph_87ypw" iconPath="/icons/full/obj16/Association_shared.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationShared"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="#org.eclipse.papyrus.umldi.Association_Edge"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationSharedDirected_Edge" identifier="org.eclipse.papyrus.umldi.AssociationSharedDirected_Edge" name="AssociationSharedDirected Edge" hint="Association_Edge">
-    <iconEntry xmi:id="_Re1vRRR_EeeYdIsxYO_sHQ" iconPath="/icons/Association_shared_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationSharedDirected"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="#org.eclipse.papyrus.umldi.Association_Edge"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Association_Shape" identifier="org.eclipse.papyrus.umldi.Association_Shape" name="Association Shape" hint="Association_Shape">
-    <iconEntry xmi:id="_r4u7ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Association_Shape_CN" identifier="org.eclipse.papyrus.umldi.Association_Shape_CN" name="Association Shape CN" hint="Association_Shape_CN">
-    <iconEntry xmi:id="_r8YE8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape" identifier="org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape" name="Behavior Execution Specification Shape" hint="BehaviorExecutionSpecification_Shape">
-    <iconEntry xmi:id="_r4zzkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/BehaviorExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.BehaviorExecutionSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape_CN" name="Behavior Execution Specification Shape CN" hint="BehaviorExecutionSpecification_Shape_CN">
-    <iconEntry xmi:id="_r8ahMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/BehaviorExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.BehaviorExecutionSpecification"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Behavior_DoActivityBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Behavior_DoActivityBehaviorLabel" name="Behavior Do Activity Behavior Label" hint="Behavior_DoActivityBehaviorLabel">
-    <iconEntry xmi:id="_sfrmUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Behavior_EntryBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Behavior_EntryBehaviorLabel" name="Behavior Entry Behavior Label" hint="Behavior_EntryBehaviorLabel">
-    <iconEntry xmi:id="_sfdj4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior_As_UML::State::entry"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Behavior_ExitBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Behavior_ExitBehaviorLabel" name="Behavior Exit Behavior Label" hint="Behavior_ExitBehaviorLabel">
-    <iconEntry xmi:id="_sfmGwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior_As_UML::State::exit"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel" name="Behavior Internal Behavior Label" hint="Behavior_InternalBehaviorLabel">
-    <iconEntry xmi:id="_sfYEUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <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.umldi.BroadcastSignalAction_Shape" identifier="org.eclipse.papyrus.umldi.BroadcastSignalAction_Shape" name="Broadcast Signal Action Shape" hint="BroadcastSignalAction_Shape">
-    <iconEntry xmi:id="_r0vy8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/BroadcastSignalAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.BroadcastSignalAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CallBehaviorAction_BaseType" identifier="org.eclipse.papyrus.umldi.CallBehaviorAction_BaseType" name="Call Behavior Action Base Type" hint="CallBehaviorAction_BaseType">
-    <iconEntry xmi:id="_r-NQ8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallBehaviorAction"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionShape" identifier="org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionShape" name="Call Behavior Action Interaction Shape" hint="CallBehaviorAction_InteractionShape">
-    <iconEntry xmi:id="_sREikNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_vwkWkOuQEeWDDMpLFpMEMA" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionEditHelperAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.CallBehaviorAction_Shape"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionUseShape" identifier="org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionUseShape" name="Call Behavior Action Interaction Use Shape" hint="CallBehaviorAction_InteractionUseShape">
-    <iconEntry xmi:id="_sQ_qENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <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.umldi.CallBehaviorAction_Shape" identifier="org.eclipse.papyrus.umldi.CallBehaviorAction_Shape" name="Call Behavior Action Shape" hint="CallBehaviorAction_Shape">
-    <iconEntry xmi:id="_r-SwgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <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.umldi.CallEvent_Shape" identifier="org.eclipse.papyrus.umldi.CallEvent_Shape" name="Call Event Shape" hint="CallEvent_Shape">
-    <iconEntry xmi:id="_sAJxsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <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.umldi.CallOperationAction_Shape" identifier="org.eclipse.papyrus.umldi.CallOperationAction_Shape" name="Call Operation Action Shape" hint="CallOperationAction_Shape">
-    <iconEntry xmi:id="_r4BJYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <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.umldi.CentralBufferNode_Shape" identifier="org.eclipse.papyrus.umldi.CentralBufferNode_Shape" name="Central Buffer Node Shape" hint="CentralBufferNode_Shape">
-    <iconEntry xmi:id="_r4xXUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CentralBufferNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CentralBufferNode"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ChangeEvent_Shape" identifier="org.eclipse.papyrus.umldi.ChangeEvent_Shape" name="Change Event Shape" hint="ChangeEvent_Shape">
-    <iconEntry xmi:id="_sAESINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ChangeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <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.umldi.Class_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Class_ClassNestedClassifierLabel" name="Class Class Nested Classifier Label" hint="Class_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sayfQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_NestedClassifierLabel"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Class_ComponentNestedClassifierLabel" name="Class Component Nested Classifier Label" hint="Class_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sa1ikNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_NestedClassifierLabel"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Class_InterfaceNestedClassifierLabel" name="Class Interface Nested Classifier Label" hint="Class_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sa3-0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Class_NestedClassifierLabel"/>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_MetaclassShape" identifier="org.eclipse.papyrus.umldi.Class_MetaclassShape" name="Class Metaclass Shape" hint="Class_MetaclassShape">
-    <iconEntry xmi:id="_r8gAwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <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.umldi.Class_MetaclassShape_CN" identifier="org.eclipse.papyrus.umldi.Class_MetaclassShape_CN" name="Class Metaclass Shape CN" hint="Class_MetaclassShape_CN">
-    <iconEntry xmi:id="_r8lgUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <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.umldi.Class_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Class_NestedClassifierLabel" name="Class Nested Classifier Label" hint="Class_NestedClassifierLabel">
-    <iconEntry xmi:id="_sawDANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <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.umldi.Class_Shape" identifier="org.eclipse.papyrus.umldi.Class_Shape" name="Class Shape" hint="Class_Shape">
-    <iconEntry xmi:id="_rynE8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Actor_Shape_CN" identifier="org.eclipse.papyrus.umldi.Actor_Shape_CN" name="Actor Shape CN" hint="Actor_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7_qcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Actor.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Actor"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_Shape_CN" identifier="org.eclipse.papyrus.umldi.Class_Shape_CN" name="Class Shape CN" hint="Class_Shape_CN">
-    <iconEntry xmi:id="_r5FgYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AddStructuralFeatureValueAction_Shape" identifier="org.eclipse.papyrus.umldi.AddStructuralFeatureValueAction_Shape" name="Add Structural Feature Value Action Shape" hint="AddStructuralFeatureValueAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1EjENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AddStructuralFeatureValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AddStructuralFeatureValueAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ClassifierTemplateParameter_TemplateParameterLabel" identifier="org.eclipse.papyrus.umldi.ClassifierTemplateParameter_TemplateParameterLabel" name="Classifier Template Parameter Template Parameter Label" hint="ClassifierTemplateParameter_TemplateParameterLabel">
-    <iconEntry xmi:id="_sh0UUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClassifierTemplateParameter"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AddVariableValueAction_Shape" identifier="org.eclipse.papyrus.umldi.AddVariableValueAction_Shape" name="Add Variable Value Action Shape" hint="AddVariableValueAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4j78Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AddVariableValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AddVariableValueAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Classifier_SubjectShape" identifier="org.eclipse.papyrus.umldi.Classifier_SubjectShape" name="Classifier Subject Shape" hint="Classifier_SubjectShape">
-    <iconEntry xmi:id="_r8qY0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Classifier.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Classifier"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AnyReceiveEvent_Shape" identifier="org.eclipse.papyrus.umldi.AnyReceiveEvent_Shape" name="Any Receive Event Shape" hint="AnyReceiveEvent_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r_-ykNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AnyReceiveEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AnyReceiveEvent"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ClearAssociationAction_Shape" identifier="org.eclipse.papyrus.umldi.ClearAssociationAction_Shape" name="Clear Association Action Shape" hint="ClearAssociationAction_Shape">
-    <iconEntry xmi:id="_ry3joNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ClearAssociationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClearAssociationAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Artifact_ClassNestedClassifierLabel" name="Artifact Class Nested Classifier Label" hint="Artifact_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Artifact_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scsjwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ClearStructuralFeatureAction_Shape" identifier="org.eclipse.papyrus.umldi.ClearStructuralFeatureAction_Shape" name="Clear Structural Feature Action Shape" hint="ClearStructuralFeatureAction_Shape">
-    <iconEntry xmi:id="_r1KCoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClearStructuralFeatureAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Artifact_ComponentNestedClassifierLabel" name="Artifact Component Nested Classifier Label" hint="Artifact_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Artifact_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scvnENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ClearVariableAction_Shape" identifier="org.eclipse.papyrus.umldi.ClearVariableAction_Shape" name="Clear Variable Action Shape" hint="ClearVariableAction_Shape">
-    <iconEntry xmi:id="_r4hfsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ClearVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClearVariableAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_DeployedArtifactLabel" identifier="org.eclipse.papyrus.umldi.Artifact_DeployedArtifactLabel" name="Artifact Deployed Artifact Label" hint="Artifact_DeployedArtifactLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sijUINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CollaborationUse_Shape" identifier="org.eclipse.papyrus.umldi.CollaborationUse_Shape" name="Collaboration Use Shape" hint="CollaborationUse_Shape">
-    <iconEntry xmi:id="_rzlVUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CollaborationUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CollaborationUse"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Artifact_InterfaceNestedClassifierLabel" name="Artifact Interface Nested Classifier Label" hint="Artifact_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Artifact_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scyDUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CollaborationUse_Shape_CN" identifier="org.eclipse.papyrus.umldi.CollaborationUse_Shape_CN" name="Collaboration Use Shape CN" hint="CollaborationUse_Shape_CN">
-    <iconEntry xmi:id="_r6X50Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CollaborationUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CollaborationUse"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_NestedArtifactLabel" identifier="org.eclipse.papyrus.umldi.Artifact_NestedArtifactLabel" name="Artifact Nested Artifact Label" hint="Artifact_NestedArtifactLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_si4EQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Collaboration_ClassNestedClassifierLabel" name="Collaboration Class Nested Classifier Label" hint="Collaboration_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sd8g8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Collaboration_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Artifact_NestedClassifierLabel" name="Artifact Nested Classifier Label" hint="Artifact_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scqHgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Collaboration_ComponentNestedClassifierLabel" name="Collaboration Component Nested Classifier Label" hint="Collaboration_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sd-9MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Collaboration_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_Shape" identifier="org.eclipse.papyrus.umldi.Artifact_Shape" name="Artifact Shape" hint="Artifact_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4cAINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Collaboration_InterfaceNestedClassifierLabel" name="Collaboration Interface Nested Classifier Label" hint="Collaboration_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_seCAgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Collaboration_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_Shape_ACN" identifier="org.eclipse.papyrus.umldi.Artifact_Shape_ACN" name="Artifact Shape_ACN" hint="Artifact_Shape_ACN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r_gRcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Collaboration_NestedClassifierLabel" name="Collaboration Nested Classifier Label" hint="Collaboration_NestedClassifierLabel">
-    <iconEntry xmi:id="_sd5doNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Artifact_Shape_CCN" name="Artifact Shape CCN" hint="Artifact_Shape_CCN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r_OkoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_Shape" identifier="org.eclipse.papyrus.umldi.Collaboration_Shape" name="Collaboration Shape" hint="Collaboration_Shape">
-    <iconEntry xmi:id="_r0svoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Artifact_Shape_CN" identifier="org.eclipse.papyrus.umldi.Artifact_Shape_CN" name="Artifact Shape CN" hint="Artifact_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8NF0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Artifact.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Artifact"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_Shape_CN" identifier="org.eclipse.papyrus.umldi.Collaboration_Shape_CN" name="Collaboration Shape CN" hint="Collaboration_Shape_CN">
-    <iconEntry xmi:id="_r7vy0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationClass_Edge" identifier="org.eclipse.papyrus.umldi.AssociationClass_Edge" name="Association Class Edge" hint="AssociationClass_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWBUANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationClass"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CombinedFragment_CoRegionShape" identifier="org.eclipse.papyrus.umldi.CombinedFragment_CoRegionShape" name="Combined Fragment Co Region Shape" hint="CombinedFragment_CoRegionShape">
-    <iconEntry xmi:id="_sRKpMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CombinedFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CombinedFragment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationClass_Shape" identifier="org.eclipse.papyrus.umldi.AssociationClass_Shape" name="Association Class Shape" hint="AssociationClass_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0mpANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationClass"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CombinedFragment_Shape" identifier="org.eclipse.papyrus.umldi.CombinedFragment_Shape" name="Combined Fragment Shape" hint="CombinedFragment_Shape">
-    <iconEntry xmi:id="_r11_INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CombinedFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CombinedFragment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationClass_Shape_CN" identifier="org.eclipse.papyrus.umldi.AssociationClass_Shape_CN" name="Association Class Shape CN" hint="AssociationClass_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7svgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationClass"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CombinedFragment_Shape_CN" identifier="org.eclipse.papyrus.umldi.CombinedFragment_Shape_CN" name="Combined Fragment Shape CN" hint="CombinedFragment_Shape_CN">
-    <iconEntry xmi:id="_r5gXINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CombinedFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CombinedFragment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationClass_TetherEdge" identifier="org.eclipse.papyrus.umldi.AssociationClass_TetherEdge" name="Association Class Tether Edge" hint="AssociationClass_TetherEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sXbCMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/AssociationClass.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge" identifier="org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge" name="Comment Annotated Element Edge" hint="Comment_AnnotatedElementEdge">
-    <iconEntry xmi:id="_sXghwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Comment.AnnotatedElements"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Association_BranchEdge" identifier="org.eclipse.papyrus.umldi.Association_BranchEdge" name="Association Branch Edge" hint="Association_BranchEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sW_kYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Comment_Shape" identifier="org.eclipse.papyrus.umldi.Comment_Shape" name="Comment Shape" hint="Comment_Shape">
-    <iconEntry xmi:id="_rzrb8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Comment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Association_Edge" identifier="org.eclipse.papyrus.umldi.Association_Edge" name="Association Edge" hint="Association_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWw64Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Comment_Shape_CN" identifier="org.eclipse.papyrus.umldi.Comment_Shape_CN" name="Comment Shape CN" hint="Comment_Shape_CN">
-    <iconEntry xmi:id="_r6f1oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Comment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationNonDirected_Edge" identifier="org.eclipse.papyrus.umldi.AssociationNonDirected_Edge" name="AssociationNonDirected Edge" hint="Association_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ggRYoXhMEee4-vqumSjwzg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationNonDirected"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CommunicationPath_Edge" identifier="org.eclipse.papyrus.umldi.CommunicationPath_Edge" name="Communication Path Edge" hint="CommunicationPath_Edge">
-    <iconEntry xmi:id="_sW5dwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CommunicationPath.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CommunicationPath"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationDirected_Edge" identifier="org.eclipse.papyrus.umldi.AssociationDirected_Edge" name="AssociationDirected Edge" hint="Association_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Re1vQRR_EeeYdIsxYO_sHQ" iconPath="/icons/Association_none_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationDirected"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CommunicationPath_Shape" identifier="org.eclipse.papyrus.umldi.CommunicationPath_Shape" name="Communication Path Shape" hint="CommunicationPath_Shape">
-    <iconEntry xmi:id="_r3VM4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CommunicationPath.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CommunicationPath"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationComposite_Edge" identifier="org.eclipse.papyrus.umldi.AssociationComposite_Edge" name="AssociationComposite Edge" hint="Association_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_u2LSMxO6EeepH5ph_87ypw" iconPath="/icons/full/obj16/Association_composite.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationComposite"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CommunicationPath_Shape_CN" identifier="org.eclipse.papyrus.umldi.CommunicationPath_Shape_CN" name="Communication Path Shape CN" hint="CommunicationPath_Shape_CN">
-    <iconEntry xmi:id="_r7FEcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CommunicationPath.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CommunicationPath"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationCompositeDirected_Edge" identifier="org.eclipse.papyrus.umldi.AssociationCompositeDirected_Edge" name="AssociationCompositeDirected Edge" hint="Association_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Re1vQxR_EeeYdIsxYO_sHQ" iconPath="/icons/Association_composite_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationCompositeDirected"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ComponentRealization_Edge" identifier="org.eclipse.papyrus.umldi.ComponentRealization_Edge" name="Component Realization Edge" hint="ComponentRealization_Edge">
-    <iconEntry xmi:id="_sWlUsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ComponentRealization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationShared_Edge" identifier="org.eclipse.papyrus.umldi.AssociationShared_Edge" name="AssociationShared Edge" hint="Association_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_u2LSNRO6EeepH5ph_87ypw" iconPath="/icons/full/obj16/Association_shared.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationShared"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ComponentRealization_Shape" identifier="org.eclipse.papyrus.umldi.ComponentRealization_Shape" name="Component Realization Shape" hint="ComponentRealization_Shape">
-    <iconEntry xmi:id="_rzufQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ComponentRealization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.AssociationSharedDirected_Edge" identifier="org.eclipse.papyrus.umldi.AssociationSharedDirected_Edge" name="AssociationSharedDirected Edge" hint="Association_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_Re1vRRR_EeeYdIsxYO_sHQ" iconPath="/icons/Association_shared_directed.gif" bundleId="org.eclipse.papyrus.uml.service.types"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.AssociationSharedDirected"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Association_Edge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ComponentRealization_Shape_CN" identifier="org.eclipse.papyrus.umldi.ComponentRealization_Shape_CN" name="Component Realization Shape CN" hint="ComponentRealization_Shape_CN">
-    <iconEntry xmi:id="_r6iR4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ComponentRealization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Association_Shape" identifier="org.eclipse.papyrus.umldi.Association_Shape" name="Association Shape" hint="Association_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4u7ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Component_ClassNestedClassifierLabel" name="Component Class Nested Classifier Label" hint="Component_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sdOIMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Association_Shape_CN" identifier="org.eclipse.papyrus.umldi.Association_Shape_CN" name="Association Shape CN" hint="Association_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8YE8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Association.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Association"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Component_ComponentNestedClassifierLabel" name="Component Component Nested Classifier Label" hint="Component_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sdRLgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape" identifier="org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape" name="Behavior Execution Specification Shape" hint="BehaviorExecutionSpecification_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4zzkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/BehaviorExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.BehaviorExecutionSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Component_InterfaceNestedClassifierLabel" name="Component Interface Nested Classifier Label" hint="Component_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sdTnwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Component_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.BehaviorExecutionSpecification_Shape_CN" name="Behavior Execution Specification Shape CN" hint="BehaviorExecutionSpecification_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8ahMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/BehaviorExecutionSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.BehaviorExecutionSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Component_NestedClassifierLabel" name="Component Nested Classifier Label" hint="Component_NestedClassifierLabel">
-    <iconEntry xmi:id="_sdLE4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Behavior_DoActivityBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Behavior_DoActivityBehaviorLabel" name="Behavior Do Activity Behavior Label" hint="Behavior_DoActivityBehaviorLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sfrmUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior_As_UML::State::doActivity"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Behavior_EntryBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Behavior_EntryBehaviorLabel" name="Behavior Entry Behavior Label" hint="Behavior_EntryBehaviorLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sfdj4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior_As_UML::State::entry"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_PackagedElementShape" identifier="org.eclipse.papyrus.umldi.Component_PackagedElementShape" name="Component Packaged Element Shape" hint="Component_PackagedElementShape">
-    <iconEntry xmi:id="_r9PAkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Behavior_ExitBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Behavior_ExitBehaviorLabel" name="Behavior Exit Behavior Label" hint="Behavior_ExitBehaviorLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sfmGwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Behavior_As_UML::State::exit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_PackagedElementShape_CCN" identifier="org.eclipse.papyrus.umldi.Component_PackagedElementShape_CCN" name="Component Packaged Element Shape CCN" hint="Component_PackagedElementShape_CCN">
-    <iconEntry xmi:id="_r-sZINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Behavior_InternalBehaviorLabel" name="Behavior Internal Behavior Label" hint="Behavior_InternalBehaviorLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sfYEUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Behavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Component_PackagedElementShape_CN" identifier="org.eclipse.papyrus.umldi.Component_PackagedElementShape_CN" name="Component Packaged Element Shape CN" hint="Component_PackagedElementShape_CN">
-    <iconEntry xmi:id="_r9UgINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.BroadcastSignalAction_Shape" identifier="org.eclipse.papyrus.umldi.BroadcastSignalAction_Shape" name="Broadcast Signal Action Shape" hint="BroadcastSignalAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0vy8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/BroadcastSignalAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.BroadcastSignalAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_Shape" identifier="org.eclipse.papyrus.umldi.Component_Shape" name="Component Shape" hint="Component_Shape">
-    <iconEntry xmi:id="_ry9DMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CallBehaviorAction_BaseType" identifier="org.eclipse.papyrus.umldi.CallBehaviorAction_BaseType" name="Call Behavior Action Base Type" hint="CallBehaviorAction_BaseType" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-NQ8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CallBehaviorAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Component_Shape_CCN" name="Component Shape CCN" hint="Component_Shape_CCN">
-    <iconEntry xmi:id="_r-chgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionShape" identifier="org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionShape" name="Call Behavior Action Interaction Shape" hint="CallBehaviorAction_InteractionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.CallBehaviorAction_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sREikNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_vwkWkOuQEeWDDMpLFpMEMA" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.interactionoverview.edit.advices.CallBehaviorActionAsInteractionEditHelperAdvice"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_Shape_CN" identifier="org.eclipse.papyrus.umldi.Component_Shape_CN" name="Component Shape CN" hint="Component_Shape_CN">
-    <iconEntry xmi:id="_r5d64Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionUseShape" identifier="org.eclipse.papyrus.umldi.CallBehaviorAction_InteractionUseShape" name="Call Behavior Action Interaction Use Shape" hint="CallBehaviorAction_InteractionUseShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.CallBehaviorAction_BaseType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQ_qENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConditionalNode_Shape" identifier="org.eclipse.papyrus.umldi.ConditionalNode_Shape" name="Conditional Node Shape" hint="ConditionalNode_Shape">
-    <iconEntry xmi:id="_r1zi4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConditionalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConditionalNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CallBehaviorAction_Shape" identifier="org.eclipse.papyrus.umldi.CallBehaviorAction_Shape" name="Call Behavior Action Shape" hint="CallBehaviorAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.CallBehaviorAction_BaseType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-SwgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConnectableElementTemplateParameter_TemplateParameterLabel" identifier="org.eclipse.papyrus.umldi.ConnectableElementTemplateParameter_TemplateParameterLabel" name="Connectable Element Template Parameter Template Parameter Label" hint="ConnectableElementTemplateParameter_TemplateParameterLabel">
-    <iconEntry xmi:id="_shxRANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConnectableElementTemplateParameter"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CallEvent_Shape" identifier="org.eclipse.papyrus.umldi.CallEvent_Shape" name="Call Event Shape" hint="CallEvent_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAJxsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.ConnectableElement_CollaborationRoleShape" identifier="org.eclipse.papyrus.umldi.ConnectableElement_CollaborationRoleShape" name="Connectable Element Collaboration Role Shape" hint="ConnectableElement_CollaborationRoleShape">
-    <iconEntry xmi:id="_r_lxANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConnectableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration.CollaborationRole"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CallOperationAction_Shape" identifier="org.eclipse.papyrus.umldi.CallOperationAction_Shape" name="Call Operation Action Shape" hint="CallOperationAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4BJYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CallOperationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.ConnectionPointReference_Shape" identifier="org.eclipse.papyrus.umldi.ConnectionPointReference_Shape" name="Connection Point Reference Shape" hint="ConnectionPointReference_Shape">
-    <iconEntry xmi:id="_r21doNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConnectionPointReference.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConnectionPointReference"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CentralBufferNode_Shape" identifier="org.eclipse.papyrus.umldi.CentralBufferNode_Shape" name="Central Buffer Node Shape" hint="CentralBufferNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4xXUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CentralBufferNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CentralBufferNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConnectionPointReference_Shape_CN" identifier="org.eclipse.papyrus.umldi.ConnectionPointReference_Shape_CN" name="Connection Point Reference Shape CN" hint="ConnectionPointReference_Shape_CN">
-    <iconEntry xmi:id="_r6yJgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConnectionPointReference.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConnectionPointReference"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ChangeEvent_Shape" identifier="org.eclipse.papyrus.umldi.ChangeEvent_Shape" name="Change Event Shape" hint="ChangeEvent_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAESINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ChangeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Connector_Edge" identifier="org.eclipse.papyrus.umldi.Connector_Edge" name="Connector Edge" hint="Connector_Edge">
-    <iconEntry xmi:id="_sWJ24Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Connector"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Class_ClassNestedClassifierLabel" name="Class Class Nested Classifier Label" hint="Class_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Class_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sayfQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape" identifier="org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape" name="Consider Ignore Fragment Shape" hint="ConsiderIgnoreFragment_Shape">
-    <iconEntry xmi:id="_r4Zj4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConsiderIgnoreFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConsiderIgnoreFragment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Class_ComponentNestedClassifierLabel" name="Class Component Nested Classifier Label" hint="Class_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Class_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sa1ikNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape_CN" identifier="org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape_CN" name="Consider Ignore Fragment Shape CN" hint="ConsiderIgnoreFragment_Shape_CN">
-    <iconEntry xmi:id="_r8HmQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConsiderIgnoreFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConsiderIgnoreFragment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Class_InterfaceNestedClassifierLabel" name="Class Interface Nested Classifier Label" hint="Class_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Class_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sa3-0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge" identifier="org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge" name="Constraint Constrained Element Edge" hint="Constraint_ConstrainedElementEdge">
-    <iconEntry xmi:id="_sXmBUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint.ConstrainedElements"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_MetaclassShape" identifier="org.eclipse.papyrus.umldi.Class_MetaclassShape" name="Class Metaclass Shape" hint="Class_MetaclassShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8gAwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_ContextEdge" identifier="org.eclipse.papyrus.umldi.Constraint_ContextEdge" name="Constraint Context Edge" hint="Constraint_ContextEdge">
-    <iconEntry xmi:id="_sXrg4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint.Context"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_MetaclassShape_CN" identifier="org.eclipse.papyrus.umldi.Class_MetaclassShape_CN" name="Class Metaclass Shape CN" hint="Class_MetaclassShape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8lgUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_LocalPostconditionShape" identifier="org.eclipse.papyrus.umldi.Constraint_LocalPostconditionShape" name="Constraint Local Postcondition Shape" hint="Constraint_LocalPostconditionShape">
-    <iconEntry xmi:id="_r9ZYoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Class_NestedClassifierLabel" name="Class Nested Classifier Label" hint="Class_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sawDANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_LocalPreconditionShape" identifier="org.eclipse.papyrus.umldi.Constraint_LocalPreconditionShape" name="Constraint Local Precondition Shape" hint="Constraint_LocalPreconditionShape">
-    <iconEntry xmi:id="_r9e4MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_Shape" identifier="org.eclipse.papyrus.umldi.Class_Shape" name="Class Shape" hint="Class_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rynE8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape" identifier="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape" name="Constraint Packaged Element Shape" hint="Constraint_PackagedElementShape">
-    <iconEntry xmi:id="_r9EBcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Class_Shape_CN" identifier="org.eclipse.papyrus.umldi.Class_Shape_CN" name="Class Shape CN" hint="Class_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5FgYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Class"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN" identifier="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN" name="Constraint Packaged Element Shape CN" hint="Constraint_PackagedElementShape_CN">
-    <iconEntry xmi:id="_r9JhANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ClassifierTemplateParameter_TemplateParameterLabel" identifier="org.eclipse.papyrus.umldi.ClassifierTemplateParameter_TemplateParameterLabel" name="Classifier Template Parameter Template Parameter Label" hint="ClassifierTemplateParameter_TemplateParameterLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sh0UUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ClassifierTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClassifierTemplateParameter"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_PostconditionLabel" identifier="org.eclipse.papyrus.umldi.Constraint_PostconditionLabel" name="Constraint Postcondition Label" hint="Constraint_PostconditionLabel">
-    <iconEntry xmi:id="_sgwkYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Classifier_SubjectShape" identifier="org.eclipse.papyrus.umldi.Classifier_SubjectShape" name="Classifier Subject Shape" hint="Classifier_SubjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8qY0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Classifier.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Classifier"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_PreconditionLabel" identifier="org.eclipse.papyrus.umldi.Constraint_PreconditionLabel" name="Constraint Precondition Label" hint="Constraint_PreconditionLabel">
-    <iconEntry xmi:id="_shLbINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ClearAssociationAction_Shape" identifier="org.eclipse.papyrus.umldi.ClearAssociationAction_Shape" name="Clear Association Action Shape" hint="ClearAssociationAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ry3joNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ClearAssociationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClearAssociationAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_Shape" identifier="org.eclipse.papyrus.umldi.Constraint_Shape" name="Constraint Shape" hint="Constraint_Shape">
-    <iconEntry xmi:id="_r2EBkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ClearStructuralFeatureAction_Shape" identifier="org.eclipse.papyrus.umldi.ClearStructuralFeatureAction_Shape" name="Clear Structural Feature Action Shape" hint="ClearStructuralFeatureAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1KCoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ClearStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClearStructuralFeatureAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Constraint_Shape_CCN" name="Constraint Shape CCN" hint="Constraint_Shape_CCN">
-    <iconEntry xmi:id="_r-iBENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ClearVariableAction_Shape" identifier="org.eclipse.papyrus.umldi.ClearVariableAction_Shape" name="Clear Variable Action Shape" hint="ClearVariableAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4hfsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ClearVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ClearVariableAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_Shape_CN" identifier="org.eclipse.papyrus.umldi.Constraint_Shape_CN" name="Constraint Shape CN" hint="Constraint_Shape_CN">
-    <iconEntry xmi:id="_r5zSENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CollaborationUse_Shape" identifier="org.eclipse.papyrus.umldi.CollaborationUse_Shape" name="Collaboration Use Shape" hint="CollaborationUse_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzlVUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CollaborationUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CollaborationUse"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Continuation_Shape" identifier="org.eclipse.papyrus.umldi.Continuation_Shape" name="Continuation Shape" hint="Continuation_Shape">
-    <iconEntry xmi:id="_r02goNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Continuation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Continuation"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CollaborationUse_Shape_CN" identifier="org.eclipse.papyrus.umldi.CollaborationUse_Shape_CN" name="Collaboration Use Shape CN" hint="CollaborationUse_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6X50Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CollaborationUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CollaborationUse"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Continuation_Shape_CN" identifier="org.eclipse.papyrus.umldi.Continuation_Shape_CN" name="Continuation Shape CN" hint="Continuation_Shape_CN">
-    <iconEntry xmi:id="_r7yPENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Continuation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Continuation"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Collaboration_ClassNestedClassifierLabel" name="Collaboration Class Nested Classifier Label" hint="Collaboration_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Collaboration_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sd8g8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ControlFlow_Edge" identifier="org.eclipse.papyrus.umldi.ControlFlow_Edge" name="Control Flow Edge" hint="ControlFlow_Edge">
-    <iconEntry xmi:id="_sWi4cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ControlFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ControlFlow"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Collaboration_ComponentNestedClassifierLabel" name="Collaboration Component Nested Classifier Label" hint="Collaboration_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Collaboration_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sd-9MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CreateLinkAction_Shape" identifier="org.eclipse.papyrus.umldi.CreateLinkAction_Shape" name="Create Link Action Shape" hint="CreateLinkAction_Shape">
-    <iconEntry xmi:id="_r0X_gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CreateLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CreateLinkAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Collaboration_InterfaceNestedClassifierLabel" name="Collaboration Interface Nested Classifier Label" hint="Collaboration_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Collaboration_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seCAgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CreateLinkObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.CreateLinkObjectAction_Shape" name="Create Link Object Action Shape" hint="CreateLinkObjectAction_Shape">
-    <iconEntry xmi:id="_r1bIYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CreateLinkObjectAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Collaboration_NestedClassifierLabel" name="Collaboration Nested Classifier Label" hint="Collaboration_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sd5doNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CreateObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.CreateObjectAction_Shape" name="Create Object Action Shape" hint="CreateObjectAction_Shape">
-    <iconEntry xmi:id="_r4r3wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CreateObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CreateObjectAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_Shape" identifier="org.eclipse.papyrus.umldi.Collaboration_Shape" name="Collaboration Shape" hint="Collaboration_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0svoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataStoreNode_Shape" identifier="org.eclipse.papyrus.umldi.DataStoreNode_Shape" name="Data Store Node Shape" hint="DataStoreNode_Shape">
-    <iconEntry xmi:id="_r4224Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataStoreNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DataStoreNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Collaboration_Shape_CN" identifier="org.eclipse.papyrus.umldi.Collaboration_Shape_CN" name="Collaboration Shape CN" hint="Collaboration_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7vy0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Collaboration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DataType_ClassNestedClassifierLabel" name="Data Type Class Nested Classifier Label" hint="DataType_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_scV-cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CombinedFragment_CoRegionShape" identifier="org.eclipse.papyrus.umldi.CombinedFragment_CoRegionShape" name="Combined Fragment Co Region Shape" hint="CombinedFragment_CoRegionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRKpMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CombinedFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CombinedFragment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DataType_ComponentNestedClassifierLabel" name="Data Type Component Nested Classifier Label" hint="DataType_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_scZBwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CombinedFragment_Shape" identifier="org.eclipse.papyrus.umldi.CombinedFragment_Shape" name="Combined Fragment Shape" hint="CombinedFragment_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r11_INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CombinedFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CombinedFragment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DataType_InterfaceNestedClassifierLabel" name="Data Type Interface Nested Classifier Label" hint="DataType_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_scbeANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DataType_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CombinedFragment_Shape_CN" identifier="org.eclipse.papyrus.umldi.CombinedFragment_Shape_CN" name="Combined Fragment Shape CN" hint="CombinedFragment_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5gXINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CombinedFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CombinedFragment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DataType_NestedClassifierLabel" name="Data Type Nested Classifier Label" hint="DataType_NestedClassifierLabel">
-    <iconEntry xmi:id="_scTiMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DataType"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge" identifier="org.eclipse.papyrus.umldi.Comment_AnnotatedElementEdge" name="Comment Annotated Element Edge" hint="Comment_AnnotatedElementEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sXghwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Comment.AnnotatedElements"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_Shape" identifier="org.eclipse.papyrus.umldi.DataType_Shape" name="Data Type Shape" hint="DataType_Shape">
-    <iconEntry xmi:id="_rziSANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DataType"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Comment_Shape" identifier="org.eclipse.papyrus.umldi.Comment_Shape" name="Comment Shape" hint="Comment_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzrb8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.DataType_Shape_CN" identifier="org.eclipse.papyrus.umldi.DataType_Shape_CN" name="Data Type Shape CN" hint="DataType_Shape_CN">
-    <iconEntry xmi:id="_r6Ov4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DataType"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Comment_Shape_CN" identifier="org.eclipse.papyrus.umldi.Comment_Shape_CN" name="Comment Shape CN" hint="Comment_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6f1oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.DecisionNode_DecisionInputLabel" identifier="org.eclipse.papyrus.umldi.DecisionNode_DecisionInputLabel" name="Decision Node Decision Input Label" hint="DecisionNode_DecisionInputLabel">
-    <iconEntry xmi:id="_skvFcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DecisionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DecisionNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CommunicationPath_Edge" identifier="org.eclipse.papyrus.umldi.CommunicationPath_Edge" name="Communication Path Edge" hint="CommunicationPath_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sW5dwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CommunicationPath.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CommunicationPath"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DecisionNode_Shape" identifier="org.eclipse.papyrus.umldi.DecisionNode_Shape" name="Decision Node Shape" hint="DecisionNode_Shape">
-    <iconEntry xmi:id="_r0bC0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DecisionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DecisionNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CommunicationPath_Shape" identifier="org.eclipse.papyrus.umldi.CommunicationPath_Shape" name="Communication Path Shape" hint="CommunicationPath_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3VM4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CommunicationPath.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CommunicationPath"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Dependency_BranchEdge" identifier="org.eclipse.papyrus.umldi.Dependency_BranchEdge" name="Dependency Branch Edge" hint="Dependency_BranchEdge">
-    <iconEntry xmi:id="_sXFD8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CommunicationPath_Shape_CN" identifier="org.eclipse.papyrus.umldi.CommunicationPath_Shape_CN" name="Communication Path Shape CN" hint="CommunicationPath_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7FEcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CommunicationPath.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CommunicationPath"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Dependency_Edge" identifier="org.eclipse.papyrus.umldi.Dependency_Edge" name="Dependency Edge" hint="Dependency_Edge">
-    <iconEntry xmi:id="_sWz-MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ComponentRealization_Edge" identifier="org.eclipse.papyrus.umldi.ComponentRealization_Edge" name="Component Realization Edge" hint="ComponentRealization_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWlUsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ComponentRealization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Dependency_RoleBindingEdge" identifier="org.eclipse.papyrus.umldi.Dependency_RoleBindingEdge" name="Dependency Role Binding Edge" hint="Dependency_RoleBindingEdge">
-    <iconEntry xmi:id="_sXKjgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CollaborationUse.RoleBinding"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ComponentRealization_Shape" identifier="org.eclipse.papyrus.umldi.ComponentRealization_Shape" name="Component Realization Shape" hint="ComponentRealization_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzufQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ComponentRealization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Dependency_Shape" identifier="org.eclipse.papyrus.umldi.Dependency_Shape" name="Dependency Shape" hint="Dependency_Shape">
-    <iconEntry xmi:id="_r2zBYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ComponentRealization_Shape_CN" identifier="org.eclipse.papyrus.umldi.ComponentRealization_Shape_CN" name="Component Realization Shape CN" hint="ComponentRealization_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6iR4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ComponentRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ComponentRealization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Dependency_Shape_CN" identifier="org.eclipse.papyrus.umldi.Dependency_Shape_CN" name="Dependency Shape CN" hint="Dependency_Shape_CN">
-    <iconEntry xmi:id="_r6sp8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Dependency"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Component_ClassNestedClassifierLabel" name="Component Class Nested Classifier Label" hint="Component_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Component_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdOIMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_ClassNestedClassifierLabel" name="Deployment Specification Class Nested Classifier Label" hint="DeploymentSpecification_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sb1BENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Component_ComponentNestedClassifierLabel" name="Component Component Nested Classifier Label" hint="Component_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Component_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdRLgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_ComponentNestedClassifierLabel" name="Deployment Specification Component Nested Classifier Label" hint="DeploymentSpecification_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sb3dUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Component_InterfaceNestedClassifierLabel" name="Component Interface Nested Classifier Label" hint="Component_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Component_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdTnwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_DeployedArtifactLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_DeployedArtifactLabel" name="Deployment Specification Deployed Artifact Label" hint="DeploymentSpecification_DeployedArtifactLabel">
-    <iconEntry xmi:id="_sicmcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Component_NestedClassifierLabel" name="Component Nested Classifier Label" hint="Component_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdLE4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_InterfaceNestedClassifierLabel" name="Deployment Specification Interface Nested Classifier Label" hint="DeploymentSpecification_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sb6goNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.DeploymentSpecification_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_PackagedElementShape" identifier="org.eclipse.papyrus.umldi.Component_PackagedElementShape" name="Component Packaged Element Shape" hint="Component_PackagedElementShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r9PAkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedArtifactLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedArtifactLabel" name="Deployment Specification Nested Artifact Label" hint="DeploymentSpecification_NestedArtifactLabel">
-    <iconEntry xmi:id="_si1A8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_PackagedElementShape_CCN" identifier="org.eclipse.papyrus.umldi.Component_PackagedElementShape_CCN" name="Component Packaged Element Shape CCN" hint="Component_PackagedElementShape_CCN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-sZINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedClassifierLabel" name="Deployment Specification Nested Classifier Label" hint="DeploymentSpecification_NestedClassifierLabel">
-    <iconEntry xmi:id="_sbx9wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_PackagedElementShape_CN" identifier="org.eclipse.papyrus.umldi.Component_PackagedElementShape_CN" name="Component Packaged Element Shape CN" hint="Component_PackagedElementShape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r9UgINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Component_As_UML::Component::packagedElement"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape" name="Deployment Specification Shape" hint="DeploymentSpecification_Shape">
-    <iconEntry xmi:id="_r2Rc8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_Shape" identifier="org.eclipse.papyrus.umldi.Component_Shape" name="Component Shape" hint="Component_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ry9DMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_ACN" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_ACN" name="Deployment Specification Shape_ACN" hint="DeploymentSpecification_Shape_ACN">
-    <iconEntry xmi:id="_r_dOINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Component_Shape_CCN" name="Component Shape CCN" hint="Component_Shape_CCN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-chgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CCN" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CCN" name="Deployment Specification Shape CCN" hint="DeploymentSpecification_Shape_CCN">
-    <iconEntry xmi:id="_r_LhUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Component_Shape_CN" identifier="org.eclipse.papyrus.umldi.Component_Shape_CN" name="Component Shape CN" hint="Component_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5d64Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Component.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Component"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CN" name="Deployment Specification Shape CN" hint="DeploymentSpecification_Shape_CN">
-    <iconEntry xmi:id="_r6G0ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConditionalNode_Shape" identifier="org.eclipse.papyrus.umldi.ConditionalNode_Shape" name="Conditional Node Shape" hint="ConditionalNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1zi4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConditionalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConditionalNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Deployment_Edge" identifier="org.eclipse.papyrus.umldi.Deployment_Edge" name="Deployment Edge" hint="Deployment_Edge">
-    <iconEntry xmi:id="_sWq0QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Deployment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Deployment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConnectableElementTemplateParameter_TemplateParameterLabel" identifier="org.eclipse.papyrus.umldi.ConnectableElementTemplateParameter_TemplateParameterLabel" name="Connectable Element Template Parameter Template Parameter Label" hint="ConnectableElementTemplateParameter_TemplateParameterLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_shxRANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConnectableElementTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConnectableElementTemplateParameter"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Deployment_Shape" identifier="org.eclipse.papyrus.umldi.Deployment_Shape" name="Deployment Shape" hint="Deployment_Shape">
-    <iconEntry xmi:id="_r2v-ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Deployment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Deployment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConnectableElement_CollaborationRoleShape" identifier="org.eclipse.papyrus.umldi.ConnectableElement_CollaborationRoleShape" name="Connectable Element Collaboration Role Shape" hint="ConnectableElement_CollaborationRoleShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r_lxANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConnectableElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Collaboration.CollaborationRole"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Deployment_Shape_CN" identifier="org.eclipse.papyrus.umldi.Deployment_Shape_CN" name="Deployment Shape CN" hint="Deployment_Shape_CN">
-    <iconEntry xmi:id="_r6nxcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Deployment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Deployment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConnectionPointReference_Shape" identifier="org.eclipse.papyrus.umldi.ConnectionPointReference_Shape" name="Connection Point Reference Shape" hint="ConnectionPointReference_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r21doNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConnectionPointReference.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConnectionPointReference"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DestroyLinkAction_Shape" identifier="org.eclipse.papyrus.umldi.DestroyLinkAction_Shape" name="Destroy Link Action Shape" hint="DestroyLinkAction_Shape">
-    <iconEntry xmi:id="_r4JFMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DestroyLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DestroyLinkAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConnectionPointReference_Shape_CN" identifier="org.eclipse.papyrus.umldi.ConnectionPointReference_Shape_CN" name="Connection Point Reference Shape CN" hint="ConnectionPointReference_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6yJgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConnectionPointReference.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConnectionPointReference"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DestroyObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.DestroyObjectAction_Shape" name="Destroy Object Action Shape" hint="DestroyObjectAction_Shape">
-    <iconEntry xmi:id="_r4ecYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DestroyObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DestroyObjectAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Connector_Edge" identifier="org.eclipse.papyrus.umldi.Connector_Edge" name="Connector Edge" hint="Connector_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWJ24Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Connector"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DestructionOccurrenceSpecification_Shape" identifier="org.eclipse.papyrus.umldi.DestructionOccurrenceSpecification_Shape" name="Destruction Occurrence Specification Shape" hint="DestructionOccurrenceSpecification_Shape">
-    <iconEntry xmi:id="_rzTogNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DestructionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DestructionOccurrenceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape" identifier="org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape" name="Consider Ignore Fragment Shape" hint="ConsiderIgnoreFragment_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4Zj4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConsiderIgnoreFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConsiderIgnoreFragment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DestructionOccurrenceSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.DestructionOccurrenceSpecification_Shape_CN" name="Destruction Occurrence Specification Shape CN" hint="DestructionOccurrenceSpecification_Shape_CN">
-    <iconEntry xmi:id="_r5708Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DestructionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DestructionOccurrenceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape_CN" identifier="org.eclipse.papyrus.umldi.ConsiderIgnoreFragment_Shape_CN" name="Consider Ignore Fragment Shape CN" hint="ConsiderIgnoreFragment_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8HmQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ConsiderIgnoreFragment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ConsiderIgnoreFragment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Device_ClassNestedClassifierLabel" name="Device Class Nested Classifier Label" hint="Device_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sangINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Device_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge" identifier="org.eclipse.papyrus.umldi.Constraint_ConstrainedElementEdge" name="Constraint Constrained Element Edge" hint="Constraint_ConstrainedElementEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sXmBUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint.ConstrainedElements"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Device_ComponentNestedClassifierLabel" name="Device Component Nested Classifier Label" hint="Device_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sap8YNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Device_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_ContextEdge" identifier="org.eclipse.papyrus.umldi.Constraint_ContextEdge" name="Constraint Context Edge" hint="Constraint_ContextEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sXrg4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint.Context"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Device_InterfaceNestedClassifierLabel" name="Device Interface Nested Classifier Label" hint="Device_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sas_sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Device_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_LocalPostconditionShape" identifier="org.eclipse.papyrus.umldi.Constraint_LocalPostconditionShape" name="Constraint Local Postcondition Shape" hint="Constraint_LocalPostconditionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r9ZYoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Device_NestedClassifierLabel" name="Device Nested Classifier Label" hint="Device_NestedClassifierLabel">
-    <iconEntry xmi:id="_sakc0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Device"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_LocalPreconditionShape" identifier="org.eclipse.papyrus.umldi.Constraint_LocalPreconditionShape" name="Constraint Local Precondition Shape" hint="Constraint_LocalPreconditionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r9e4MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint_As_UML::Action::localPrecondition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_NestedNodeLabel" identifier="org.eclipse.papyrus.umldi.Device_NestedNodeLabel" name="Device Nested Node Label" hint="Device_NestedNodeLabel">
-    <iconEntry xmi:id="_sjH74Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Device"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape" identifier="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape" name="Constraint Packaged Element Shape" hint="Constraint_PackagedElementShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r9EBcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_Shape" identifier="org.eclipse.papyrus.umldi.Device_Shape" name="Device Shape" hint="Device_Shape">
-    <iconEntry xmi:id="_r1eLsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Device"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN" identifier="org.eclipse.papyrus.umldi.Constraint_PackagedElementShape_CN" name="Constraint Packaged Element Shape CN" hint="Constraint_PackagedElementShape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r9JhANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint_As_UML::Package::packagedElement"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Device_Shape_CCN" name="Device Shape CCN" hint="Device_Shape_CCN">
-    <iconEntry xmi:id="_r-3YQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.um.Device_As_UML::Node::nestedNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_PostconditionLabel" identifier="org.eclipse.papyrus.umldi.Constraint_PostconditionLabel" name="Constraint Postcondition Label" hint="Constraint_PostconditionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sgwkYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_Shape_CN" identifier="org.eclipse.papyrus.umldi.Device_Shape_CN" name="Device Shape CN" hint="Device_Shape_CN">
-    <iconEntry xmi:id="_r5IjsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Device"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_PreconditionLabel" identifier="org.eclipse.papyrus.umldi.Constraint_PreconditionLabel" name="Constraint Precondition Label" hint="Constraint_PreconditionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_shLbINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Diagram_ShortcutShape" identifier="org.eclipse.papyrus.umldi.Diagram_ShortcutShape" name="Diagram Shortcut Shape" hint="Diagram_ShortcutShape">
-    <iconEntry xmi:id="_sRs0sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Diagram.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="../../../plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#org.eclipse.papyrus.gmfdiag.common.Diagram"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_Shape" identifier="org.eclipse.papyrus.umldi.Constraint_Shape" name="Constraint Shape" hint="Constraint_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2EBkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_LocalPostconditionShape" identifier="org.eclipse.papyrus.umldi.DurationConstraint_LocalPostconditionShape" name="Duration Constraint Local Postcondition Shape" hint="DurationConstraint_LocalPostconditionShape">
-    <iconEntry xmi:id="_r9thsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Constraint_Shape_CCN" name="Constraint Shape CCN" hint="Constraint_Shape_CCN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-iBENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_LocalPreconditionShape" identifier="org.eclipse.papyrus.umldi.DurationConstraint_LocalPreconditionShape" name="Duration Constraint Local Precondition Shape" hint="DurationConstraint_LocalPreconditionShape">
-    <iconEntry xmi:id="_r-CR0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Constraint_Shape_CN" identifier="org.eclipse.papyrus.umldi.Constraint_Shape_CN" name="Constraint Shape CN" hint="Constraint_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5zSENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Constraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Constraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_PostconditionLabel" identifier="org.eclipse.papyrus.umldi.DurationConstraint_PostconditionLabel" name="Duration Constraint Postcondition Label" hint="DurationConstraint_PostconditionLabel">
-    <iconEntry xmi:id="_sgthENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Continuation_Shape" identifier="org.eclipse.papyrus.umldi.Continuation_Shape" name="Continuation Shape" hint="Continuation_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r02goNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Continuation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Continuation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_PreconditionLabel" identifier="org.eclipse.papyrus.umldi.DurationConstraint_PreconditionLabel" name="Duration Constraint Precondition Label" hint="DurationConstraint_PreconditionLabel">
-    <iconEntry xmi:id="_shIX0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Continuation_Shape_CN" identifier="org.eclipse.papyrus.umldi.Continuation_Shape_CN" name="Continuation Shape CN" hint="Continuation_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7yPENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Continuation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Continuation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_Shape" identifier="org.eclipse.papyrus.umldi.DurationConstraint_Shape" name="Duration Constraint Shape" hint="DurationConstraint_Shape">
-    <iconEntry xmi:id="_r3rLINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ControlFlow_Edge" identifier="org.eclipse.papyrus.umldi.ControlFlow_Edge" name="Control Flow Edge" hint="ControlFlow_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWi4cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ControlFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.DurationConstraint_Shape_CN" identifier="org.eclipse.papyrus.umldi.DurationConstraint_Shape_CN" name="Duration Constraint Shape CN" hint="DurationConstraint_Shape_CN">
-    <iconEntry xmi:id="_r7U8ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CreateLinkAction_Shape" identifier="org.eclipse.papyrus.umldi.CreateLinkAction_Shape" name="Create Link Action Shape" hint="CreateLinkAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0X_gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CreateLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CreateLinkAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationInterval_Shape" identifier="org.eclipse.papyrus.umldi.DurationInterval_Shape" name="Duration Interval Shape" hint="DurationInterval_Shape">
-    <iconEntry xmi:id="_sAjaUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationInterval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationInterval"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CreateLinkObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.CreateLinkObjectAction_Shape" name="Create Link Object Action Shape" hint="CreateLinkObjectAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1bIYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CreateLinkObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CreateLinkObjectAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationObservation_EventEdge" identifier="org.eclipse.papyrus.umldi.DurationObservation_EventEdge" name="Duration Observation Event Edge" hint="DurationObservation_EventEdge">
-    <iconEntry xmi:id="_sXQDENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationObservation.Event"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.CreateObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.CreateObjectAction_Shape" name="Create Object Action Shape" hint="CreateObjectAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4r3wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/CreateObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CreateObjectAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationObservation_Shape" identifier="org.eclipse.papyrus.umldi.DurationObservation_Shape" name="Duration Observation Shape" hint="DurationObservation_Shape">
-    <iconEntry xmi:id="_r4UEUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationObservation"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataStoreNode_Shape" identifier="org.eclipse.papyrus.umldi.DataStoreNode_Shape" name="Data Store Node Shape" hint="DataStoreNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4224Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataStoreNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DataStoreNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationObservation_Shape_CN" identifier="org.eclipse.papyrus.umldi.DurationObservation_Shape_CN" name="Duration Observation Shape CN" hint="DurationObservation_Shape_CN">
-    <iconEntry xmi:id="_r8CGsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationObservation"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DataType_ClassNestedClassifierLabel" name="Data Type Class Nested Classifier Label" hint="DataType_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.DataType_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scV-cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Duration_Shape" identifier="org.eclipse.papyrus.umldi.Duration_Shape" name="Duration Shape" hint="Duration_Shape">
-    <iconEntry xmi:id="_rzLFoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Duration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Duration"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DataType_ComponentNestedClassifierLabel" name="Data Type Component Nested Classifier Label" hint="DataType_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.DataType_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scZBwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Duration_Shape_CN" identifier="org.eclipse.papyrus.umldi.Duration_Shape_CN" name="Duration Shape CN" hint="Duration_Shape_CN">
-    <iconEntry xmi:id="_r5tygNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Duration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Duration"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DataType_InterfaceNestedClassifierLabel" name="Data Type Interface Nested Classifier Label" hint="DataType_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.DataType_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scbeANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ElementImport_Edge" identifier="org.eclipse.papyrus.umldi.ElementImport_Edge" name="Element Import Edge" hint="ElementImport_Edge">
-    <iconEntry xmi:id="_sVw1UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ElementImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ElementImport"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DataType_NestedClassifierLabel" name="Data Type Nested Classifier Label" hint="DataType_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scTiMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DataType"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Element_ContainmentEdge" identifier="org.eclipse.papyrus.umldi.Element_ContainmentEdge" name="Element Containment Edge" hint="Element_ContainmentEdge">
-    <iconEntry xmi:id="_sX2gANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element.OwnedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_Shape" identifier="org.eclipse.papyrus.umldi.DataType_Shape" name="Data Type Shape" hint="DataType_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rziSANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DataType"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.EnumerationLiteral_DeployedArtifactLabel" identifier="org.eclipse.papyrus.umldi.EnumerationLiteral_DeployedArtifactLabel" name="Enumeration Literal Deployed Artifact Label" hint="EnumerationLiteral_DeployedArtifactLabel">
-    <iconEntry xmi:id="_siaKMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.EnumerationLiteral"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DataType_Shape_CN" identifier="org.eclipse.papyrus.umldi.DataType_Shape_CN" name="Data Type Shape CN" hint="DataType_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6Ov4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DataType"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel" identifier="org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel" name="Enumeration Literal Literal Label" hint="EnumerationLiteral_LiteralLabel">
-    <iconEntry xmi:id="_sgMjsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.EnumerationLiteral"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DecisionNode_DecisionInputLabel" identifier="org.eclipse.papyrus.umldi.DecisionNode_DecisionInputLabel" name="Decision Node Decision Input Label" hint="DecisionNode_DecisionInputLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_skvFcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DecisionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.EnumerationLiteral_Shape" identifier="org.eclipse.papyrus.umldi.EnumerationLiteral_Shape" name="Enumeration Literal Shape" hint="EnumerationLiteral_Shape">
-    <iconEntry xmi:id="_ryphMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.EnumerationLiteral"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DecisionNode_Shape" identifier="org.eclipse.papyrus.umldi.DecisionNode_Shape" name="Decision Node Shape" hint="DecisionNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0bC0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DecisionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.EnumerationLiteral_Shape_CN" identifier="org.eclipse.papyrus.umldi.EnumerationLiteral_Shape_CN" name="Enumeration Literal Shape CN" hint="EnumerationLiteral_Shape_CN">
-    <iconEntry xmi:id="_r5K_8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.EnumerationLiteral"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Dependency_BranchEdge" identifier="org.eclipse.papyrus.umldi.Dependency_BranchEdge" name="Dependency Branch Edge" hint="Dependency_BranchEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sXFD8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Enumeration_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Enumeration_ClassNestedClassifierLabel" name="Enumeration Class Nested Classifier Label" hint="Enumeration_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_scAAMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Dependency_Edge" identifier="org.eclipse.papyrus.umldi.Dependency_Edge" name="Dependency Edge" hint="Dependency_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWz-MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Enumeration_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Enumeration_ComponentNestedClassifierLabel" name="Enumeration Component Nested Classifier Label" hint="Enumeration_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_scDDgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Dependency_RoleBindingEdge" identifier="org.eclipse.papyrus.umldi.Dependency_RoleBindingEdge" name="Dependency Role Binding Edge" hint="Dependency_RoleBindingEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sXKjgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CollaborationUse.RoleBinding"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Enumeration_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Enumeration_InterfaceNestedClassifierLabel" name="Enumeration Interface Nested Classifier Label" hint="Enumeration_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_scFfwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Enumeration_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Dependency_Shape" identifier="org.eclipse.papyrus.umldi.Dependency_Shape" name="Dependency Shape" hint="Dependency_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2zBYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Enumeration_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Enumeration_NestedClassifierLabel" name="Enumeration Nested Classifier Label" hint="Enumeration_NestedClassifierLabel">
-    <iconEntry xmi:id="_sb9j8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Enumeration"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Dependency_Shape_CN" identifier="org.eclipse.papyrus.umldi.Dependency_Shape_CN" name="Dependency Shape CN" hint="Dependency_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6sp8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Enumeration_Shape" identifier="org.eclipse.papyrus.umldi.Enumeration_Shape" name="Enumeration Shape" hint="Enumeration_Shape">
-    <iconEntry xmi:id="_r2UgQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Enumeration"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_ClassNestedClassifierLabel" name="Deployment Specification Class Nested Classifier Label" hint="DeploymentSpecification_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sb1BENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Enumeration_Shape_CN" identifier="org.eclipse.papyrus.umldi.Enumeration_Shape_CN" name="Enumeration Shape CN" hint="Enumeration_Shape_CN">
-    <iconEntry xmi:id="_r6JQUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Enumeration"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_ComponentNestedClassifierLabel" name="Deployment Specification Component Nested Classifier Label" hint="DeploymentSpecification_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sb3dUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExceptionHandler_Edge" identifier="org.eclipse.papyrus.umldi.ExceptionHandler_Edge" name="Exception Handler Edge" hint="ExceptionHandler_Edge">
-    <iconEntry xmi:id="_sVlPINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExceptionHandler.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExceptionHandler"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_DeployedArtifactLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_DeployedArtifactLabel" name="Deployment Specification Deployed Artifact Label" hint="DeploymentSpecification_DeployedArtifactLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sicmcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_ClassNestedClassifierLabel" name="Execution Environment Class Nested Classifier Label" hint="ExecutionEnvironment_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sa9eYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_InterfaceNestedClassifierLabel" name="Deployment Specification Interface Nested Classifier Label" hint="DeploymentSpecification_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sb6goNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_ComponentNestedClassifierLabel" name="Execution Environment Component Nested Classifier Label" hint="ExecutionEnvironment_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sbAhsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedArtifactLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedArtifactLabel" name="Deployment Specification Nested Artifact Label" hint="DeploymentSpecification_NestedArtifactLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_si1A8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_InterfaceNestedClassifierLabel" name="Execution Environment Interface Nested Classifier Label" hint="ExecutionEnvironment_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sbC98Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_NestedClassifierLabel" name="Deployment Specification Nested Classifier Label" hint="DeploymentSpecification_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbx9wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedClassifierLabel" name="Execution Environment Nested Classifier Label" hint="ExecutionEnvironment_NestedClassifierLabel">
-    <iconEntry xmi:id="_sa7CINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionEnvironment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape" name="Deployment Specification Shape" hint="DeploymentSpecification_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2Rc8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedNodeLabel" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedNodeLabel" name="Execution Environment Nested Node Label" hint="ExecutionEnvironment_NestedNodeLabel">
-    <iconEntry xmi:id="_sjK_MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionEnvironment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_ACN" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_ACN" name="Deployment Specification Shape_ACN" hint="DeploymentSpecification_Shape_ACN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r_dOINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape" name="Execution Environment Shape" hint="ExecutionEnvironment_Shape">
-    <iconEntry xmi:id="_r2L9YNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionEnvironment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CCN" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CCN" name="Deployment Specification Shape CCN" hint="DeploymentSpecification_Shape_CCN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r_LhUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CCN" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CCN" name="Execution Environment Shape CCN" hint="ExecutionEnvironment_Shape_CCN">
-    <iconEntry xmi:id="_r-830Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.um.ExecutionEnvironment_As_UML::Node::nestedNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.DeploymentSpecification_Shape_CN" name="Deployment Specification Shape CN" hint="DeploymentSpecification_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6G0ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DeploymentSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DeploymentSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CN" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CN" name="Execution Environment Shape CN" hint="ExecutionEnvironment_Shape_CN">
-    <iconEntry xmi:id="_r51uUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionEnvironment"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Deployment_Edge" identifier="org.eclipse.papyrus.umldi.Deployment_Edge" name="Deployment Edge" hint="Deployment_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWq0QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Deployment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Deployment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionOccurrenceSpecification_Shape" identifier="org.eclipse.papyrus.umldi.ExecutionOccurrenceSpecification_Shape" name="Execution Occurrence Specification Shape" hint="ExecutionOccurrenceSpecification_Shape">
-    <iconEntry xmi:id="_r1Vo0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Deployment_Shape" identifier="org.eclipse.papyrus.umldi.Deployment_Shape" name="Deployment Shape" hint="Deployment_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2v-ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Deployment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Deployment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionOccurrenceSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.ExecutionOccurrenceSpecification_Shape_CN" name="Execution Occurrence Specification Shape CN" hint="ExecutionOccurrenceSpecification_Shape_CN">
-    <iconEntry xmi:id="_r8SlYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Deployment_Shape_CN" identifier="org.eclipse.papyrus.umldi.Deployment_Shape_CN" name="Deployment Shape CN" hint="Deployment_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6nxcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Deployment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Deployment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExpansionNode_InputShape" identifier="org.eclipse.papyrus.umldi.ExpansionNode_InputShape" name="Expansion Node Input Shape" hint="ExpansionNode_InputShape">
-    <iconEntry xmi:id="_sCIusNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DestroyLinkAction_Shape" identifier="org.eclipse.papyrus.umldi.DestroyLinkAction_Shape" name="Destroy Link Action Shape" hint="DestroyLinkAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4JFMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DestroyLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DestroyLinkAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExpansionNode_OutputShape" identifier="org.eclipse.papyrus.umldi.ExpansionNode_OutputShape" name="Expansion Node Output Shape" hint="ExpansionNode_OutputShape">
-    <iconEntry xmi:id="_sCNnMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DestroyObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.DestroyObjectAction_Shape" name="Destroy Object Action Shape" hint="DestroyObjectAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4ecYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DestroyObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DestroyObjectAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExpansionNode_Shape" identifier="org.eclipse.papyrus.umldi.ExpansionNode_Shape" name="Expansion Node Shape" hint="ExpansionNode_Shape">
-    <iconEntry xmi:id="_r2Z_0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExpansionNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DestructionOccurrenceSpecification_Shape" identifier="org.eclipse.papyrus.umldi.DestructionOccurrenceSpecification_Shape" name="Destruction Occurrence Specification Shape" hint="DestructionOccurrenceSpecification_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzTogNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DestructionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DestructionOccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExpansionRegion_Shape" identifier="org.eclipse.papyrus.umldi.ExpansionRegion_Shape" name="Expansion Region Shape" hint="ExpansionRegion_Shape">
-    <iconEntry xmi:id="_r0psUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExpansionRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExpansionRegion"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DestructionOccurrenceSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.DestructionOccurrenceSpecification_Shape_CN" name="Destruction Occurrence Specification Shape CN" hint="DestructionOccurrenceSpecification_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5708Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DestructionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DestructionOccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Expression_Shape" identifier="org.eclipse.papyrus.umldi.Expression_Shape" name="Expression Shape" hint="Expression_Shape">
-    <iconEntry xmi:id="_sAa3cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Expression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Expression"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Device_ClassNestedClassifierLabel" name="Device Class Nested Classifier Label" hint="Device_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Device_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sangINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Extend_Edge" identifier="org.eclipse.papyrus.umldi.Extend_Edge" name="Extend Edge" hint="Extend_Edge">
-    <iconEntry xmi:id="_sWdY4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Extend.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Extend"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Device_ComponentNestedClassifierLabel" name="Device Component Nested Classifier Label" hint="Device_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Device_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sap8YNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel" name="Extension End Attribute Label" hint="ExtensionEnd_AttributeLabel">
-    <iconEntry xmi:id="_sY1XcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionEnd"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Device_InterfaceNestedClassifierLabel" name="Device Interface Nested Classifier Label" hint="Device_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Device_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sas_sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_ClassAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_ClassAttributeLabel" name="Extension End Class Attribute Label" hint="ExtensionEnd_ClassAttributeLabel">
-    <iconEntry xmi:id="_sY9TQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Device_NestedClassifierLabel" name="Device Nested Classifier Label" hint="Device_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sakc0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Device"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_ComponentAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_ComponentAttributeLabel" name="Extension End Component Attribute Label" hint="ExtensionEnd_ComponentAttributeLabel">
-    <iconEntry xmi:id="_sZCy0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_NestedNodeLabel" identifier="org.eclipse.papyrus.umldi.Device_NestedNodeLabel" name="Device Nested Node Label" hint="Device_NestedNodeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sjH74Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Device"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_DataTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_DataTypeAttributeLabel" name="Extension End Data Type Attribute Label" hint="ExtensionEnd_DataTypeAttributeLabel">
-    <iconEntry xmi:id="_sY63ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_Shape" identifier="org.eclipse.papyrus.umldi.Device_Shape" name="Device Shape" hint="Device_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1eLsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Device"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_Edge" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_Edge" name="Extension End Edge" hint="ExtensionEnd_Edge">
-    <iconEntry xmi:id="_sWoYANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionEnd"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Device_Shape_CCN" name="Device Shape CCN" hint="Device_Shape_CCN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-3YQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.um.Device_As_UML::Node::nestedNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_InterfaceAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_InterfaceAttributeLabel" name="Extension End Interface Attribute Label" hint="ExtensionEnd_InterfaceAttributeLabel">
-    <iconEntry xmi:id="_sZF2INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Device_Shape_CN" identifier="org.eclipse.papyrus.umldi.Device_Shape_CN" name="Device Shape CN" hint="Device_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5IjsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Device.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Device"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_PrimitiveTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_PrimitiveTypeAttributeLabel" name="Extension End Primitive Type Attribute Label" hint="ExtensionEnd_PrimitiveTypeAttributeLabel">
-    <iconEntry xmi:id="_sZAWkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Diagram_ShortcutShape" identifier="org.eclipse.papyrus.umldi.Diagram_ShortcutShape" name="Diagram Shortcut Shape" hint="Diagram_ShortcutShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRs0sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Diagram.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/notation.elementtypesconfigurations#org.eclipse.papyrus.gmfdiag.common.Diagram"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_Shape" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_Shape" name="Extension End Shape" hint="ExtensionEnd_Shape">
-    <iconEntry xmi:id="_r1QJQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionEnd"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_LocalPostconditionShape" identifier="org.eclipse.papyrus.umldi.DurationConstraint_LocalPostconditionShape" name="Duration Constraint Local Postcondition Shape" hint="DurationConstraint_LocalPostconditionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r9thsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_Shape_CN" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_Shape_CN" name="Extension End Shape CN" hint="ExtensionEnd_Shape_CN">
-    <iconEntry xmi:id="_r8PiENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionEnd"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_LocalPreconditionShape" identifier="org.eclipse.papyrus.umldi.DurationConstraint_LocalPreconditionShape" name="Duration Constraint Local Precondition Shape" hint="DurationConstraint_LocalPreconditionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-CR0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint_As_UML::Action::localPrecondition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_SignalAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_SignalAttributeLabel" name="Extension End Signal Attribute Label" hint="ExtensionEnd_SignalAttributeLabel">
-    <iconEntry xmi:id="_sY3zsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_PostconditionLabel" identifier="org.eclipse.papyrus.umldi.DurationConstraint_PostconditionLabel" name="Duration Constraint Postcondition Label" hint="DurationConstraint_PostconditionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sgthENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel" identifier="org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel" name="Extension Point Classifier Extension Point Label" hint="ExtensionPoint_ClassifierExtensionPointLabel">
-    <iconEntry xmi:id="_skgb8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionPoint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_PreconditionLabel" identifier="org.eclipse.papyrus.umldi.DurationConstraint_PreconditionLabel" name="Duration Constraint Precondition Label" hint="DurationConstraint_PreconditionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_shIX0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel" identifier="org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel" name="Extension Point Extension Point Label" hint="ExtensionPoint_ExtensionPointLabel">
-    <iconEntry xmi:id="_sfTL0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionPoint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_Shape" identifier="org.eclipse.papyrus.umldi.DurationConstraint_Shape" name="Duration Constraint Shape" hint="DurationConstraint_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3rLINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Extension_Edge" identifier="org.eclipse.papyrus.umldi.Extension_Edge" name="Extension Edge" hint="Extension_Edge">
-    <iconEntry xmi:id="_sV70cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Extension.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Extension"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationConstraint_Shape_CN" identifier="org.eclipse.papyrus.umldi.DurationConstraint_Shape_CN" name="Duration Constraint Shape CN" hint="DurationConstraint_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7U8ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Extension_Shape" identifier="org.eclipse.papyrus.umldi.Extension_Shape" name="Extension Shape" hint="Extension_Shape">
-    <iconEntry xmi:id="_ry_fcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Extension.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Extension"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationInterval_Shape" identifier="org.eclipse.papyrus.umldi.DurationInterval_Shape" name="Duration Interval Shape" hint="DurationInterval_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAjaUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationInterval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationInterval"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Extension_Shape_CN" identifier="org.eclipse.papyrus.umldi.Extension_Shape_CN" name="Extension Shape CN" hint="Extension_Shape_CN">
-    <iconEntry xmi:id="_r5jacNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Extension.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Extension"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationObservation_EventEdge" identifier="org.eclipse.papyrus.umldi.DurationObservation_EventEdge" name="Duration Observation Event Edge" hint="DurationObservation_EventEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sXQDENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationObservation.Event"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FinalState_Shape" identifier="org.eclipse.papyrus.umldi.FinalState_Shape" name="Final State Shape" hint="FinalState_Shape">
-    <iconEntry xmi:id="_r2ffYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FinalState.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FinalState"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationObservation_Shape" identifier="org.eclipse.papyrus.umldi.DurationObservation_Shape" name="Duration Observation Shape" hint="DurationObservation_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4UEUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationObservation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FinalState_Shape_CN" identifier="org.eclipse.papyrus.umldi.FinalState_Shape_CN" name="Final State Shape CN" hint="FinalState_Shape_CN">
-    <iconEntry xmi:id="_r6SaQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FinalState.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FinalState"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.DurationObservation_Shape_CN" identifier="org.eclipse.papyrus.umldi.DurationObservation_Shape_CN" name="Duration Observation Shape CN" hint="DurationObservation_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8CGsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/DurationObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.DurationObservation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FlowFinalNode_Shape" identifier="org.eclipse.papyrus.umldi.FlowFinalNode_Shape" name="Flow Final Node Shape" hint="FlowFinalNode_Shape">
-    <iconEntry xmi:id="_r3YQMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FlowFinalNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Duration_Shape" identifier="org.eclipse.papyrus.umldi.Duration_Shape" name="Duration Shape" hint="Duration_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzLFoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Duration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Duration"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ForkNode_Shape" identifier="org.eclipse.papyrus.umldi.ForkNode_Shape" name="Fork Node Shape" hint="ForkNode_Shape">
-    <iconEntry xmi:id="_r1gn8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ForkNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Duration_Shape_CN" identifier="org.eclipse.papyrus.umldi.Duration_Shape_CN" name="Duration Shape CN" hint="Duration_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5tygNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Duration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Duration"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FunctionBehavior_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_ClassNestedClassifierLabel" name="Function Behavior Class Nested Classifier Label" hint="FunctionBehavior_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sdw6wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FunctionBehavior_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ElementImport_Edge" identifier="org.eclipse.papyrus.umldi.ElementImport_Edge" name="Element Import Edge" hint="ElementImport_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sVw1UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ElementImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ElementImport"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FunctionBehavior_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_ComponentNestedClassifierLabel" name="Function Behavior Component Nested Classifier Label" hint="FunctionBehavior_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sdzXANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FunctionBehavior_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Element_ContainmentEdge" identifier="org.eclipse.papyrus.umldi.Element_ContainmentEdge" name="Element Containment Edge" hint="Element_ContainmentEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sX2gANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Element.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Element.OwnedElement"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FunctionBehavior_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_InterfaceNestedClassifierLabel" name="Function Behavior Interface Nested Classifier Label" hint="FunctionBehavior_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sd2aUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FunctionBehavior_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.EnumerationLiteral_DeployedArtifactLabel" identifier="org.eclipse.papyrus.umldi.EnumerationLiteral_DeployedArtifactLabel" name="Enumeration Literal Deployed Artifact Label" hint="EnumerationLiteral_DeployedArtifactLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_siaKMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.FunctionBehavior_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_NestedClassifierLabel" name="Function Behavior Nested Classifier Label" hint="FunctionBehavior_NestedClassifierLabel">
-    <iconEntry xmi:id="_sdt3cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FunctionBehavior"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel" identifier="org.eclipse.papyrus.umldi.EnumerationLiteral_LiteralLabel" name="Enumeration Literal Literal Label" hint="EnumerationLiteral_LiteralLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sgMjsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.FunctionBehavior_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_OwnedBehaviorLabel" name="Function Behavior Owned Behavior Label" hint="FunctionBehavior_OwnedBehaviorLabel">
-    <iconEntry xmi:id="_sjtxwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FunctionBehavior"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.EnumerationLiteral_Shape" identifier="org.eclipse.papyrus.umldi.EnumerationLiteral_Shape" name="Enumeration Literal Shape" hint="EnumerationLiteral_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ryphMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.FunctionBehavior_Shape" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_Shape" name="Function Behavior Shape" hint="FunctionBehavior_Shape">
-    <iconEntry xmi:id="_rzICUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FunctionBehavior"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.EnumerationLiteral_Shape_CN" identifier="org.eclipse.papyrus.umldi.EnumerationLiteral_Shape_CN" name="Enumeration Literal Shape CN" hint="EnumerationLiteral_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5K_8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/EnumerationLiteral.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.FunctionBehavior_Shape_CN" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_Shape_CN" name="Function Behavior Shape CN" hint="FunctionBehavior_Shape_CN">
-    <iconEntry xmi:id="_r5rWQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FunctionBehavior"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Enumeration_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Enumeration_ClassNestedClassifierLabel" name="Enumeration Class Nested Classifier Label" hint="Enumeration_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Enumeration_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scAAMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Gate_Shape" identifier="org.eclipse.papyrus.umldi.Gate_Shape" name="Gate Shape" hint="Gate_Shape">
-    <iconEntry xmi:id="_r1-iANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Gate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Gate"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Enumeration_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Enumeration_ComponentNestedClassifierLabel" name="Enumeration Component Nested Classifier Label" hint="Enumeration_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Enumeration_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scDDgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Gate_Shape_CN" identifier="org.eclipse.papyrus.umldi.Gate_Shape_CN" name="Gate Shape CN" hint="Gate_Shape_CN">
-    <iconEntry xmi:id="_r5wOwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Gate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Gate"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Enumeration_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Enumeration_InterfaceNestedClassifierLabel" name="Enumeration Interface Nested Classifier Label" hint="Enumeration_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Enumeration_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scFfwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.GeneralOrdering_Edge" identifier="org.eclipse.papyrus.umldi.GeneralOrdering_Edge" name="General Ordering Edge" hint="GeneralOrdering_Edge">
-    <iconEntry xmi:id="_sWU2ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/GeneralOrdering.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.GeneralOrdering"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Enumeration_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Enumeration_NestedClassifierLabel" name="Enumeration Nested Classifier Label" hint="Enumeration_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sb9j8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.GeneralOrdering_Shape" identifier="org.eclipse.papyrus.umldi.GeneralOrdering_Shape" name="General Ordering Shape" hint="GeneralOrdering_Shape">
-    <iconEntry xmi:id="_rzZvINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/GeneralOrdering.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.GeneralOrdering"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Enumeration_Shape" identifier="org.eclipse.papyrus.umldi.Enumeration_Shape" name="Enumeration Shape" hint="Enumeration_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2UgQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.GeneralOrdering_Shape_CN" identifier="org.eclipse.papyrus.umldi.GeneralOrdering_Shape_CN" name="General Ordering Shape CN" hint="GeneralOrdering_Shape_CN">
-    <iconEntry xmi:id="_r6BUgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/GeneralOrdering.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.GeneralOrdering"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Enumeration_Shape_CN" identifier="org.eclipse.papyrus.umldi.Enumeration_Shape_CN" name="Enumeration Shape CN" hint="Enumeration_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6JQUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Enumeration.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.GeneralizationSet_Edge" identifier="org.eclipse.papyrus.umldi.GeneralizationSet_Edge" name="Generalization Set Edge" hint="GeneralizationSet_Edge">
-    <iconEntry xmi:id="_sVrVwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/GeneralizationSet.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.GeneralizationSet"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExceptionHandler_Edge" identifier="org.eclipse.papyrus.umldi.ExceptionHandler_Edge" name="Exception Handler Edge" hint="ExceptionHandler_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sVlPINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExceptionHandler.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExceptionHandler"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Generalization_Edge" identifier="org.eclipse.papyrus.umldi.Generalization_Edge" name="Generalization Edge" hint="Generalization_Edge">
-    <iconEntry xmi:id="_sV2U4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Generalization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_ClassNestedClassifierLabel" name="Execution Environment Class Nested Classifier Label" hint="ExecutionEnvironment_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sa9eYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Include_Edge" identifier="org.eclipse.papyrus.umldi.Include_Edge" name="Include Edge" hint="Include_Edge">
-    <iconEntry xmi:id="_sWaVkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Include.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Include"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_ComponentNestedClassifierLabel" name="Execution Environment Component Nested Classifier Label" hint="ExecutionEnvironment_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbAhsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationFlow_Edge" identifier="org.eclipse.papyrus.umldi.InformationFlow_Edge" name="Information Flow Edge" hint="InformationFlow_Edge">
-    <iconEntry xmi:id="_sWGzkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationFlow"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_InterfaceNestedClassifierLabel" name="Execution Environment Interface Nested Classifier Label" hint="ExecutionEnvironment_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbC98Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.InformationItem_ClassNestedClassifierLabel" name="Information Item Class Nested Classifier Label" hint="InformationItem_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sdlUkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedClassifierLabel" name="Execution Environment Nested Classifier Label" hint="ExecutionEnvironment_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sa7CINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionEnvironment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.InformationItem_ComponentNestedClassifierLabel" name="Information Item Component Nested Classifier Label" hint="InformationItem_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sdoX4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedNodeLabel" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_NestedNodeLabel" name="Execution Environment Nested Node Label" hint="ExecutionEnvironment_NestedNodeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sjK_MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionEnvironment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.InformationItem_InterfaceNestedClassifierLabel" name="Information Item Interface Nested Classifier Label" hint="InformationItem_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sdrbMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.InformationItem_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape" name="Execution Environment Shape" hint="ExecutionEnvironment_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2L9YNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionEnvironment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.InformationItem_NestedClassifierLabel" name="Information Item Nested Classifier Label" hint="InformationItem_NestedClassifierLabel">
-    <iconEntry xmi:id="_sdiRQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationItem"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CCN" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CCN" name="Execution Environment Shape CCN" hint="ExecutionEnvironment_Shape_CCN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-830Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.um.ExecutionEnvironment_As_UML::Node::nestedNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_Shape" identifier="org.eclipse.papyrus.umldi.InformationItem_Shape" name="Information Item Shape" hint="InformationItem_Shape">
-    <iconEntry xmi:id="_r0kMwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationItem"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CN" identifier="org.eclipse.papyrus.umldi.ExecutionEnvironment_Shape_CN" name="Execution Environment Shape CN" hint="ExecutionEnvironment_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r51uUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionEnvironment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionEnvironment"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_Shape_CN" identifier="org.eclipse.papyrus.umldi.InformationItem_Shape_CN" name="Information Item Shape CN" hint="InformationItem_Shape_CN">
-    <iconEntry xmi:id="_r7qTQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationItem"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionOccurrenceSpecification_Shape" identifier="org.eclipse.papyrus.umldi.ExecutionOccurrenceSpecification_Shape" name="Execution Occurrence Specification Shape" hint="ExecutionOccurrenceSpecification_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1Vo0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InitialNode_Shape" identifier="org.eclipse.papyrus.umldi.InitialNode_Shape" name="Initial Node Shape" hint="InitialNode_Shape">
-    <iconEntry xmi:id="_r4Go8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InitialNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExecutionOccurrenceSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.ExecutionOccurrenceSpecification_Shape_CN" name="Execution Occurrence Specification Shape CN" hint="ExecutionOccurrenceSpecification_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8SlYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExecutionOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExecutionOccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AcceptCallActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_AcceptCallActionInputShape" name="Input Pin Accept Call Action Input Shape" hint="InputPin_AcceptCallActionInputShape">
-    <iconEntry xmi:id="_sKjD0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExpansionNode_InputShape" identifier="org.eclipse.papyrus.umldi.ExpansionNode_InputShape" name="Expansion Node Input Shape" hint="ExpansionNode_InputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sCIusNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsInput"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AcceptEventActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_AcceptEventActionInputShape" name="Input Pin Accept Event Action Input Shape" hint="InputPin_AcceptEventActionInputShape">
-    <iconEntry xmi:id="_sIue4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExpansionNode_OutputShape" identifier="org.eclipse.papyrus.umldi.ExpansionNode_OutputShape" name="Expansion Node Output Shape" hint="ExpansionNode_OutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sCNnMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_AsOutput"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionInputShape" name="Input Pin Add Structural Feature Value Action Input Shape" hint="InputPin_AddStructuralFeatureValueActionInputShape">
-    <iconEntry xmi:id="_sM_64Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExpansionNode_Shape" identifier="org.eclipse.papyrus.umldi.ExpansionNode_Shape" name="Expansion Node Shape" hint="ExpansionNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2Z_0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExpansionNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExpansionNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionInsertAtShape" name="Input Pin Add Structural Feature Value Action Insert At Shape" hint="InputPin_AddStructuralFeatureValueActionInsertAtShape">
-    <iconEntry xmi:id="_sMm5UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExpansionRegion_Shape" identifier="org.eclipse.papyrus.umldi.ExpansionRegion_Shape" name="Expansion Region Shape" hint="ExpansionRegion_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0psUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExpansionRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExpansionRegion"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape" name="Input Pin Add Structural Feature Value Action Object Shape" hint="InputPin_AddStructuralFeatureValueActionObjectShape">
-    <iconEntry xmi:id="_sM3YANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Expression_Shape" identifier="org.eclipse.papyrus.umldi.Expression_Shape" name="Expression Shape" hint="Expression_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAa3cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Expression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Expression"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionValueShape" name="Input Pin Add Structural Feature Value Action Value Shape" hint="InputPin_AddStructuralFeatureValueActionValueShape">
-    <iconEntry xmi:id="_sMu1INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Extend_Edge" identifier="org.eclipse.papyrus.umldi.Extend_Edge" name="Extend Edge" hint="Extend_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWdY4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Extend.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Extend"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInputShape" name="Input Pin Add Variable Value Action Input Shape" hint="InputPin_AddVariableValueActionInputShape">
-    <iconEntry xmi:id="_sPhqcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel" name="Extension End Attribute Label" hint="ExtensionEnd_AttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sY1XcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionEnd"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInsertAtShape" name="Input Pin Add Variable Value Action Insert At Shape" hint="InputPin_AddVariableValueActionInsertAtShape">
-    <iconEntry xmi:id="_sPQksNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_ClassAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_ClassAttributeLabel" name="Extension End Class Attribute Label" hint="ExtensionEnd_ClassAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sY9TQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape" name="Input Pin Add Variable Value Action Value Shape" hint="InputPin_AddVariableValueActionValueShape">
-    <iconEntry xmi:id="_sPZHkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_ComponentAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_ComponentAttributeLabel" name="Extension End Component Attribute Label" hint="ExtensionEnd_ComponentAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZCy0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape" name="Input Pin Broadcast Signal Action Argument Shape" hint="InputPin_BroadcastSignalActionArgumentShape">
-    <iconEntry xmi:id="_sLUf4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_DataTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_DataTypeAttributeLabel" name="Extension End Data Type Attribute Label" hint="ExtensionEnd_DataTypeAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sY63ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionInputShape" name="Input Pin Broadcast Signal Action Input Shape" hint="InputPin_BroadcastSignalActionInputShape">
-    <iconEntry xmi:id="_sLdCwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_Edge" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_Edge" name="Extension End Edge" hint="ExtensionEnd_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWoYANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionEnd"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape" name="Input Pin Call Behavior Action Argument Shape" hint="InputPin_CallBehaviorActionArgumentShape">
-    <iconEntry xmi:id="_sIIpANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_InterfaceAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_InterfaceAttributeLabel" name="Extension End Interface Attribute Label" hint="ExtensionEnd_InterfaceAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZF2INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionInputShape" name="Input Pin Call Behavior Action Input Shape" hint="InputPin_CallBehaviorActionInputShape">
-    <iconEntry xmi:id="_sIRL4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_PrimitiveTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_PrimitiveTypeAttributeLabel" name="Extension End Primitive Type Attribute Label" hint="ExtensionEnd_PrimitiveTypeAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZAWkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape" identifier="org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape" name="Input Pin Call Operation Action Argument Shape" hint="InputPin_CallOperationActionArgumentShape">
-    <iconEntry xmi:id="_sJZNQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_Shape" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_Shape" name="Extension End Shape" hint="ExtensionEnd_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1QJQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionEnd"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CallOperationActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_CallOperationActionInputShape" name="Input Pin Call Operation Action Input Shape" hint="InputPin_CallOperationActionInputShape">
-    <iconEntry xmi:id="_sJhwINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_Shape_CN" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_Shape_CN" name="Extension End Shape CN" hint="ExtensionEnd_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8PiENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionEnd"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CallOperationActionTargetShape" identifier="org.eclipse.papyrus.umldi.InputPin_CallOperationActionTargetShape" name="Input Pin Call Operation Action Target Shape" hint="InputPin_CallOperationActionTargetShape">
-    <iconEntry xmi:id="_sJQqYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::CallOperationAction::target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionEnd_SignalAttributeLabel" identifier="org.eclipse.papyrus.umldi.ExtensionEnd_SignalAttributeLabel" name="Extension End Signal Attribute Label" hint="ExtensionEnd_SignalAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ExtensionEnd_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sY3zsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionEnd.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionInputShape" name="Input Pin Clear Association Action Input Shape" hint="InputPin_ClearAssociationActionInputShape">
-    <iconEntry xmi:id="_sGH20Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel" identifier="org.eclipse.papyrus.umldi.ExtensionPoint_ClassifierExtensionPointLabel" name="Extension Point Classifier Extension Point Label" hint="ExtensionPoint_ClassifierExtensionPointLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_skgb8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionPoint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionObjectShape" name="Input Pin Clear Association Action Object Shape" hint="InputPin_ClearAssociationActionObjectShape">
-    <iconEntry xmi:id="_sF_T8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel" identifier="org.eclipse.papyrus.umldi.ExtensionPoint_ExtensionPointLabel" name="Extension Point Extension Point Label" hint="ExtensionPoint_ExtensionPointLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sfTL0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ExtensionPoint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ExtensionPoint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionInputShape" name="Input Pin Clear Structural Feature Action Input Shape" hint="InputPin_ClearStructuralFeatureActionInputShape">
-    <iconEntry xmi:id="_sOV-sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Extension_Edge" identifier="org.eclipse.papyrus.umldi.Extension_Edge" name="Extension Edge" hint="Extension_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sV70cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Extension.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Extension"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionObjectShape" name="Input Pin Clear Structural Feature Action Object Shape" hint="InputPin_ClearStructuralFeatureActionObjectShape">
-    <iconEntry xmi:id="_sONb0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Extension_Shape" identifier="org.eclipse.papyrus.umldi.Extension_Shape" name="Extension Shape" hint="Extension_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ry_fcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Extension.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Extension"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ClearVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ClearVariableActionInputShape" name="Input Pin Clear Variable Action Input Shape" hint="InputPin_ClearVariableActionInputShape">
-    <iconEntry xmi:id="_sPEXcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Extension_Shape_CN" identifier="org.eclipse.papyrus.umldi.Extension_Shape_CN" name="Extension Shape CN" hint="Extension_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5jacNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Extension.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Extension"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ConditionalNodeInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ConditionalNodeInputShape" name="Input Pin Conditional Node Input Shape" hint="InputPin_ConditionalNodeInputShape">
-    <iconEntry xmi:id="_sIf1YNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FinalState_Shape" identifier="org.eclipse.papyrus.umldi.FinalState_Shape" name="Final State Shape" hint="FinalState_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2ffYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FinalState.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FinalState"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CreateLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_CreateLinkActionInputShape" name="Input Pin Create Link Action Input Shape" hint="InputPin_CreateLinkActionInputShape">
-    <iconEntry xmi:id="_sHAnoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FinalState_Shape_CN" identifier="org.eclipse.papyrus.umldi.FinalState_Shape_CN" name="Final State Shape CN" hint="FinalState_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6SaQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FinalState.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FinalState"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CreateLinkObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_CreateLinkObjectActionInputShape" name="Input Pin Create Link Object Action Input Shape" hint="InputPin_CreateLinkObjectActionInputShape">
-    <iconEntry xmi:id="_sQt9QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FlowFinalNode_Shape" identifier="org.eclipse.papyrus.umldi.FlowFinalNode_Shape" name="Flow Final Node Shape" hint="FlowFinalNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3YQMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FlowFinalNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.InputPin_CreateObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_CreateObjectActionInputShape" name="Input Pin Create Object Action Input Shape" hint="InputPin_CreateObjectActionInputShape">
-    <iconEntry xmi:id="_sQLKsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ForkNode_Shape" identifier="org.eclipse.papyrus.umldi.ForkNode_Shape" name="Fork Node Shape" hint="ForkNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1gn8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ForkNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.InputPin_DestroyLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_DestroyLinkActionInputShape" name="Input Pin Destroy Link Action Input Shape" hint="InputPin_DestroyLinkActionInputShape">
-    <iconEntry xmi:id="_sNOkYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FunctionBehavior_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_ClassNestedClassifierLabel" name="Function Behavior Class Nested Classifier Label" hint="FunctionBehavior_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.FunctionBehavior_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdw6wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionInputShape" name="Input Pin Destroy Object Action Input Shape" hint="InputPin_DestroyObjectActionInputShape">
-    <iconEntry xmi:id="_sOtLENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FunctionBehavior_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_ComponentNestedClassifierLabel" name="Function Behavior Component Nested Classifier Label" hint="FunctionBehavior_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.FunctionBehavior_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdzXANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape" name="Input Pin Destroy Object Action Target Shape" hint="InputPin_DestroyObjectActionTargetShape">
-    <iconEntry xmi:id="_sOkoMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FunctionBehavior_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_InterfaceNestedClassifierLabel" name="Function Behavior Interface Nested Classifier Label" hint="FunctionBehavior_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.FunctionBehavior_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sd2aUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ExpansionRegionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ExpansionRegionInputShape" name="Input Pin Expansion Region Input Shape" hint="InputPin_ExpansionRegionInputShape">
-    <iconEntry xmi:id="_sJwZoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FunctionBehavior_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_NestedClassifierLabel" name="Function Behavior Nested Classifier Label" hint="FunctionBehavior_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdt3cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FunctionBehavior"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_LoopNodeInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_LoopNodeInputShape" name="Input Pin Loop Node Input Shape" hint="InputPin_LoopNodeInputShape">
-    <iconEntry xmi:id="_sGo0MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FunctionBehavior_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_OwnedBehaviorLabel" name="Function Behavior Owned Behavior Label" hint="FunctionBehavior_OwnedBehaviorLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sjtxwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FunctionBehavior"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape" name="Input Pin Loop Node Variable Input Shape" hint="InputPin_LoopNodeVariableInputShape">
-    <iconEntry xmi:id="_sGfqQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FunctionBehavior_Shape" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_Shape" name="Function Behavior Shape" hint="FunctionBehavior_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzICUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FunctionBehavior"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape" name="Input Pin Opaque Action Input Shape" hint="InputPin_OpaqueActionInputShape">
-    <iconEntry xmi:id="_sO4xQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.FunctionBehavior_Shape_CN" identifier="org.eclipse.papyrus.umldi.FunctionBehavior_Shape_CN" name="Function Behavior Shape CN" hint="FunctionBehavior_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5rWQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/FunctionBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FunctionBehavior"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RaiseExceptionActionExceptionShape" identifier="org.eclipse.papyrus.umldi.InputPin_RaiseExceptionActionExceptionShape" name="Input Pin Raise Exception Action Exception Shape" hint="InputPin_RaiseExceptionActionExceptionShape">
-    <iconEntry xmi:id="_sQZ0MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Gate_Shape" identifier="org.eclipse.papyrus.umldi.Gate_Shape" name="Gate Shape" hint="Gate_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1-iANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Gate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Gate"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RaiseExceptionActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_RaiseExceptionActionInputShape" name="Input Pin Raise Exception Action Input Shape" hint="InputPin_RaiseExceptionActionInputShape">
-    <iconEntry xmi:id="_sQiXENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Gate_Shape_CN" identifier="org.eclipse.papyrus.umldi.Gate_Shape_CN" name="Gate Shape CN" hint="Gate_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5wOwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Gate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Gate"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadExtentActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadExtentActionInputShape" name="Input Pin Read Extent Action Input Shape" hint="InputPin_ReadExtentActionInputShape">
-    <iconEntry xmi:id="_sMYP0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.GeneralOrdering_Edge" identifier="org.eclipse.papyrus.umldi.GeneralOrdering_Edge" name="General Ordering Edge" hint="GeneralOrdering_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWU2ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/GeneralOrdering.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.GeneralOrdering"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionInputShape" name="Input Pin Read Is Classified Object Action Input Shape" hint="InputPin_ReadIsClassifiedObjectActionInputShape">
-    <iconEntry xmi:id="_sKTzQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.GeneralOrdering_Shape" identifier="org.eclipse.papyrus.umldi.GeneralOrdering_Shape" name="General Ordering Shape" hint="GeneralOrdering_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzZvINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/GeneralOrdering.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.GeneralOrdering"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionObjectShape" name="Input Pin Read Is Classified Object Action Object Shape" hint="InputPin_ReadIsClassifiedObjectActionObjectShape">
-    <iconEntry xmi:id="_sKKpUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.GeneralOrdering_Shape_CN" identifier="org.eclipse.papyrus.umldi.GeneralOrdering_Shape_CN" name="General Ordering Shape CN" hint="GeneralOrdering_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6BUgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/GeneralOrdering.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.GeneralOrdering"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadLinkActionInputShape" name="Input Pin Read Link Action Input Shape" hint="InputPin_ReadLinkActionInputShape">
-    <iconEntry xmi:id="_sE5HwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.GeneralizationSet_Edge" identifier="org.eclipse.papyrus.umldi.GeneralizationSet_Edge" name="Generalization Set Edge" hint="GeneralizationSet_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sVrVwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/GeneralizationSet.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.GeneralizationSet"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndActionInputShape" name="Input Pin Read Link Object End Action Input Shape" hint="InputPin_ReadLinkObjectEndActionInputShape">
-    <iconEntry xmi:id="_sLyZ8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Generalization_Edge" identifier="org.eclipse.papyrus.umldi.Generalization_Edge" name="Generalization Edge" hint="Generalization_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sV2U4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Generalization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndActionObjectShape" name="Input Pin Read Link Object End Action Object Shape" hint="InputPin_ReadLinkObjectEndActionObjectShape">
-    <iconEntry xmi:id="_sLp3ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Include_Edge" identifier="org.eclipse.papyrus.umldi.Include_Edge" name="Include Edge" hint="Include_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWaVkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Include.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Include"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndQualifierActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndQualifierActionInputShape" name="Input Pin Read Link Object End Qualifier Action Input Shape" hint="InputPin_ReadLinkObjectEndQualifierActionInputShape">
-    <iconEntry xmi:id="_sDwfUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationFlow_Edge" identifier="org.eclipse.papyrus.umldi.InformationFlow_Edge" name="Information Flow Edge" hint="InformationFlow_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWGzkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationFlow"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndQualifierActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndQualifierActionObjectShape" name="Input Pin Read Link Object End Qualifier Action Object Shape" hint="InputPin_ReadLinkObjectEndQualifierActionObjectShape">
-    <iconEntry xmi:id="_sDn8cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.InformationItem_ClassNestedClassifierLabel" name="Information Item Class Nested Classifier Label" hint="InformationItem_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.InformationItem_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdlUkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadSelfActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadSelfActionInputShape" name="Input Pin Read Self Action Input Shape" hint="InputPin_ReadSelfActionInputShape">
-    <iconEntry xmi:id="_sJ7_0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.InformationItem_ComponentNestedClassifierLabel" name="Information Item Component Nested Classifier Label" hint="InformationItem_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.InformationItem_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdoX4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionInputShape" name="Input Pin Read Structural Feature Action Input Shape" hint="InputPin_ReadStructuralFeatureActionInputShape">
-    <iconEntry xmi:id="_sN_ZYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.InformationItem_InterfaceNestedClassifierLabel" name="Information Item Interface Nested Classifier Label" hint="InformationItem_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.InformationItem_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdrbMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape" name="Input Pin Read Structural Feature Action Object Shape" hint="InputPin_ReadStructuralFeatureActionObjectShape">
-    <iconEntry xmi:id="_sN22gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.InformationItem_NestedClassifierLabel" name="Information Item Nested Classifier Label" hint="InformationItem_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdiRQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationItem"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadVariableActionInputShape" name="Input Pin Read Variable Action Input Shape" hint="InputPin_ReadVariableActionInputShape">
-    <iconEntry xmi:id="_sPt3sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_Shape" identifier="org.eclipse.papyrus.umldi.InformationItem_Shape" name="Information Item Shape" hint="InformationItem_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0kMwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationItem"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionInputShape" name="Input Pin Reclassify Object Action Input Shape" hint="InputPin_ReclassifyObjectActionInputShape">
-    <iconEntry xmi:id="_sH9C0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InformationItem_Shape_CN" identifier="org.eclipse.papyrus.umldi.InformationItem_Shape_CN" name="Information Item Shape CN" hint="InformationItem_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7qTQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InformationItem.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InformationItem"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionObjectShape" name="Input Pin Reclassify Object Action Object Shape" hint="InputPin_ReclassifyObjectActionObjectShape">
-    <iconEntry xmi:id="_sH0f8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InitialNode_Shape" identifier="org.eclipse.papyrus.umldi.InitialNode_Shape" name="Initial Node Shape" hint="InitialNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4Go8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InitialNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.InputPin_ReduceActionCollectionShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReduceActionCollectionShape" name="Input Pin Reduce Action Collection Shape" hint="InputPin_ReduceActionCollectionShape">
-    <iconEntry xmi:id="_sFnggNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AcceptCallActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_AcceptCallActionInputShape" name="Input Pin Accept Call Action Input Shape" hint="InputPin_AcceptCallActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKjD0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReduceActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReduceActionInputShape" name="Input Pin Reduce Action Input Shape" hint="InputPin_ReduceActionInputShape">
-    <iconEntry xmi:id="_sFwqcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AcceptEventActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_AcceptEventActionInputShape" name="Input Pin Accept Event Action Input Shape" hint="InputPin_AcceptEventActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIue4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionInputShape" name="Input Pin Remove Structural Feature Value Action Input Shape" hint="InputPin_RemoveStructuralFeatureValueActionInputShape">
-    <iconEntry xmi:id="_sHl2cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionInputShape" name="Input Pin Add Structural Feature Value Action Input Shape" hint="InputPin_AddStructuralFeatureValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sM_64Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionObjectShape" name="Input Pin Remove Structural Feature Value Action Object Shape" hint="InputPin_RemoveStructuralFeatureValueActionObjectShape">
-    <iconEntry xmi:id="_sHdTkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionInsertAtShape" name="Input Pin Add Structural Feature Value Action Insert At Shape" hint="InputPin_AddStructuralFeatureValueActionInsertAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMm5UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::insertAt"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionRemoveAtShape" name="Input Pin Remove Structural Feature Value Action Remove At Shape" hint="InputPin_RemoveStructuralFeatureValueActionRemoveAtShape">
-    <iconEntry xmi:id="_sHM04Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape" name="Input Pin Add Structural Feature Value Action Object Shape" hint="InputPin_AddStructuralFeatureValueActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sM3YANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionValueShape" name="Input Pin Remove Structural Feature Value Action Value Shape" hint="InputPin_RemoveStructuralFeatureValueActionValueShape">
-    <iconEntry xmi:id="_sHUwsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionValueShape" name="Input Pin Add Structural Feature Value Action Value Shape" hint="InputPin_AddStructuralFeatureValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMu1INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::AddStructuralFeatureValueAction::value"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionInputShape" name="Input Pin Remove Variable Value Action Input Shape" hint="InputPin_RemoveVariableValueActionInputShape">
-    <iconEntry xmi:id="_sFb6UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInputShape" name="Input Pin Add Variable Value Action Input Shape" hint="InputPin_AddVariableValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPhqcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionRemoveAtShape" name="Input Pin Remove Variable Value Action Remove At Shape" hint="InputPin_RemoveVariableValueActionRemoveAtShape">
-    <iconEntry xmi:id="_sFKNgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInsertAtShape" name="Input Pin Add Variable Value Action Insert At Shape" hint="InputPin_AddVariableValueActionInsertAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPQksNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::AddVariableValueAction::insertAt"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionValueShape" name="Input Pin Remove Variable Value Action Value Shape" hint="InputPin_RemoveVariableValueActionValueShape">
-    <iconEntry xmi:id="_sFT-gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape" name="Input Pin Add Variable Value Action Value Shape" hint="InputPin_AddVariableValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPZHkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReplyActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReplyActionInputShape" name="Input Pin Reply Action Input Shape" hint="InputPin_ReplyActionInputShape">
-    <iconEntry xmi:id="_sNrQUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape" name="Input Pin Broadcast Signal Action Argument Shape" hint="InputPin_BroadcastSignalActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLUf4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReplyActionReplyShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReplyActionReplyShape" name="Input Pin Reply Action Reply Shape" hint="InputPin_ReplyActionReplyShape">
-    <iconEntry xmi:id="_sNaKkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionInputShape" name="Input Pin Broadcast Signal Action Input Shape" hint="InputPin_BroadcastSignalActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLdCwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReplyActionReturnShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReplyActionReturnShape" name="Input Pin Reply Action Return Shape" hint="InputPin_ReplyActionReturnShape">
-    <iconEntry xmi:id="_sNitcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape" name="Input Pin Call Behavior Action Argument Shape" hint="InputPin_CallBehaviorActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIIpANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendObjectActionInputShape" name="Input Pin Send Object Action Input Shape" hint="InputPin_SendObjectActionInputShape">
-    <iconEntry xmi:id="_sEPngNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionInputShape" name="Input Pin Call Behavior Action Input Shape" hint="InputPin_CallBehaviorActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIRL4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendObjectActionRequestShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendObjectActionRequestShape" name="Input Pin Send Object Action Request Shape" hint="InputPin_SendObjectActionRequestShape">
-    <iconEntry xmi:id="_sD_I0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape" identifier="org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape" name="Input Pin Call Operation Action Argument Shape" hint="InputPin_CallOperationActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJZNQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendObjectActionTargetShape" name="Input Pin Send Object Action Target Shape" hint="InputPin_SendObjectActionTargetShape">
-    <iconEntry xmi:id="_sEHrsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CallOperationActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_CallOperationActionInputShape" name="Input Pin Call Operation Action Input Shape" hint="InputPin_CallOperationActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJhwINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape" name="Input Pin Send Signal Action Argument Shape" hint="InputPin_SendSignalActionArgumentShape">
-    <iconEntry xmi:id="_sEjwkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CallOperationActionTargetShape" identifier="org.eclipse.papyrus.umldi.InputPin_CallOperationActionTargetShape" name="Input Pin Call Operation Action Target Shape" hint="InputPin_CallOperationActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJQqYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::CallOperationAction::target"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendSignalActionInputShape" name="Input Pin Send Signal Action Input Shape" hint="InputPin_SendSignalActionInputShape">
-    <iconEntry xmi:id="_sEsTcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionInputShape" name="Input Pin Clear Association Action Input Shape" hint="InputPin_ClearAssociationActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGH20Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendSignalActionTargetShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendSignalActionTargetShape" name="Input Pin Send Signal Action Target Shape" hint="InputPin_SendSignalActionTargetShape">
-    <iconEntry xmi:id="_sEbNsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionObjectShape" name="Input Pin Clear Association Action Object Shape" hint="InputPin_ClearAssociationActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sF_T8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SequenceNodeInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_SequenceNodeInputShape" name="Input Pin Sequence Node Input Shape" hint="InputPin_SequenceNodeInputShape">
-    <iconEntry xmi:id="_sGUEENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionInputShape" name="Input Pin Clear Structural Feature Action Input Shape" hint="InputPin_ClearStructuralFeatureActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOV-sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_Shape" identifier="org.eclipse.papyrus.umldi.InputPin_Shape" name="Input Pin Shape" hint="InputPin_Shape">
-    <iconEntry xmi:id="_r4mYMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionObjectShape" name="Input Pin Clear Structural Feature Action Object Shape" hint="InputPin_ClearStructuralFeatureActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sONb0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionInputShape" name="Input Pin Start Classifier Behavior Action Input Shape" hint="InputPin_StartClassifierBehaviorActionInputShape">
-    <iconEntry xmi:id="_sJFEMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ClearVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ClearVariableActionInputShape" name="Input Pin Clear Variable Action Input Shape" hint="InputPin_ClearVariableActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPEXcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionObjectShape" name="Input Pin Start Classifier Behavior Action Object Shape" hint="InputPin_StartClassifierBehaviorActionObjectShape">
-    <iconEntry xmi:id="_sI9IYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ConditionalNodeInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ConditionalNodeInputShape" name="Input Pin Conditional Node Input Shape" hint="InputPin_ConditionalNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIf1YNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape" name="Input Pin Start Object Behavior Action Argument Shape" hint="InputPin_StartObjectBehaviorActionArgumentShape">
-    <iconEntry xmi:id="_sK96kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CreateLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_CreateLinkActionInputShape" name="Input Pin Create Link Action Input Shape" hint="InputPin_CreateLinkActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHAnoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionInputShape" name="Input Pin Start Object Behavior Action Input Shape" hint="InputPin_StartObjectBehaviorActionInputShape">
-    <iconEntry xmi:id="_sLF2YNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CreateLinkObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_CreateLinkObjectActionInputShape" name="Input Pin Create Link Object Action Input Shape" hint="InputPin_CreateLinkObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQt9QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionObjectShape" name="Input Pin Start Object Behavior Action Object Shape" hint="InputPin_StartObjectBehaviorActionObjectShape">
-    <iconEntry xmi:id="_sK1XsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_CreateObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_CreateObjectActionInputShape" name="Input Pin Create Object Action Input Shape" hint="InputPin_CreateObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQLKsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StructuredActivityNodeInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_StructuredActivityNodeInputShape" name="Input Pin Structured Activity Node Input Shape" hint="InputPin_StructuredActivityNodeInputShape">
-    <iconEntry xmi:id="_sDbvMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_DestroyLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_DestroyLinkActionInputShape" name="Input Pin Destroy Link Action Input Shape" hint="InputPin_DestroyLinkActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNOkYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionFirstShape" identifier="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionFirstShape" name="Input Pin Test Identity Action First Shape" hint="InputPin_TestIdentityActionFirstShape">
-    <iconEntry xmi:id="_sCzdENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionInputShape" name="Input Pin Destroy Object Action Input Shape" hint="InputPin_DestroyObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOtLENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionInputShape" name="Input Pin Test Identity Action Input Shape" hint="InputPin_TestIdentityActionInputShape">
-    <iconEntry xmi:id="_sDKCYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape" name="Input Pin Destroy Object Action Target Shape" hint="InputPin_DestroyObjectActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOkoMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionSecondShape" identifier="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionSecondShape" name="Input Pin Test Identity Action Second Shape" hint="InputPin_TestIdentityActionSecondShape">
-    <iconEntry xmi:id="_sDA4cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ExpansionRegionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ExpansionRegionInputShape" name="Input Pin Expansion Region Input Shape" hint="InputPin_ExpansionRegionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJwZoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_UnmarshallActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_UnmarshallActionInputShape" name="Input Pin Unmarshall Action Input Shape" hint="InputPin_UnmarshallActionInputShape">
-    <iconEntry xmi:id="_sMJmUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_LoopNodeInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_LoopNodeInputShape" name="Input Pin Loop Node Input Shape" hint="InputPin_LoopNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGo0MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_UnmarshallActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_UnmarshallActionObjectShape" name="Input Pin Unmarshall Action Object Shape" hint="InputPin_UnmarshallActionObjectShape">
-    <iconEntry xmi:id="_sMBDcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape" name="Input Pin Loop Node Variable Input Shape" hint="InputPin_LoopNodeVariableInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGfqQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ValueSpecificationActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ValueSpecificationActionInputShape" name="Input Pin Value Specification Action Input Shape" hint="InputPin_ValueSpecificationActionInputShape">
-    <iconEntry xmi:id="_sP76INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape" name="Input Pin Opaque Action Input Shape" hint="InputPin_OpaqueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sO4xQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InstanceSpecification_DeployedArtifactLabel" identifier="org.eclipse.papyrus.umldi.InstanceSpecification_DeployedArtifactLabel" name="Instance Specification Deployed Artifact Label" hint="InstanceSpecification_DeployedArtifactLabel">
-    <iconEntry xmi:id="_sifpwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RaiseExceptionActionExceptionShape" identifier="org.eclipse.papyrus.umldi.InputPin_RaiseExceptionActionExceptionShape" name="Input Pin Raise Exception Action Exception Shape" hint="InputPin_RaiseExceptionActionExceptionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQZ0MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InstanceSpecification_Edge" identifier="org.eclipse.papyrus.umldi.InstanceSpecification_Edge" name="Instance Specification Edge" hint="InstanceSpecification_Edge">
-    <iconEntry xmi:id="_sXxAcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification.Link"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RaiseExceptionActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_RaiseExceptionActionInputShape" name="Input Pin Raise Exception Action Input Shape" hint="InputPin_RaiseExceptionActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQiXENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InstanceSpecification_Shape" identifier="org.eclipse.papyrus.umldi.InstanceSpecification_Shape" name="Instance Specification Shape" hint="InstanceSpecification_Shape">
-    <iconEntry xmi:id="_r0AMENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadExtentActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadExtentActionInputShape" name="Input Pin Read Extent Action Input Shape" hint="InputPin_ReadExtentActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMYP0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InstanceSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.InstanceSpecification_Shape_CN" name="Instance Specification Shape CN" hint="InstanceSpecification_Shape_CN">
-    <iconEntry xmi:id="_r60lwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionInputShape" name="Input Pin Read Is Classified Object Action Input Shape" hint="InputPin_ReadIsClassifiedObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKTzQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InstanceValue_Shape" identifier="org.eclipse.papyrus.umldi.InstanceValue_Shape" name="Instance Value Shape" hint="InstanceValue_Shape">
-    <iconEntry xmi:id="_sAYbMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InstanceValue.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceValue"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionObjectShape" name="Input Pin Read Is Classified Object Action Object Shape" hint="InputPin_ReadIsClassifiedObjectActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKKpUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionConstraint_PostconditionLabel" identifier="org.eclipse.papyrus.umldi.InteractionConstraint_PostconditionLabel" name="Interaction Constraint Postcondition Label" hint="InteractionConstraint_PostconditionLabel">
-    <iconEntry xmi:id="_sgrE0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadLinkActionInputShape" name="Input Pin Read Link Action Input Shape" hint="InputPin_ReadLinkActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sE5HwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionConstraint_PreconditionLabel" identifier="org.eclipse.papyrus.umldi.InteractionConstraint_PreconditionLabel" name="Interaction Constraint Precondition Label" hint="InteractionConstraint_PreconditionLabel">
-    <iconEntry xmi:id="_shF7kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndActionInputShape" name="Input Pin Read Link Object End Action Input Shape" hint="InputPin_ReadLinkObjectEndActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLyZ8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionConstraint_Shape" identifier="org.eclipse.papyrus.umldi.InteractionConstraint_Shape" name="Interaction Constraint Shape" hint="InteractionConstraint_Shape">
-    <iconEntry xmi:id="_r1nVoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndActionObjectShape" name="Input Pin Read Link Object End Action Object Shape" hint="InputPin_ReadLinkObjectEndActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLp3ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionConstraint_Shape_CN" identifier="org.eclipse.papyrus.umldi.InteractionConstraint_Shape_CN" name="Interaction Constraint Shape CN" hint="InteractionConstraint_Shape_CN">
-    <iconEntry xmi:id="_r5QfgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndQualifierActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndQualifierActionInputShape" name="Input Pin Read Link Object End Qualifier Action Input Shape" hint="InputPin_ReadLinkObjectEndQualifierActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDwfUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionOperand_Shape" identifier="org.eclipse.papyrus.umldi.InteractionOperand_Shape" name="Interaction Operand Shape" hint="InteractionOperand_Shape">
-    <iconEntry xmi:id="_r0hJcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionOperand.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionOperand"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndQualifierActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadLinkObjectEndQualifierActionObjectShape" name="Input Pin Read Link Object End Qualifier Action Object Shape" hint="InputPin_ReadLinkObjectEndQualifierActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDn8cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionOperand_Shape_CN" identifier="org.eclipse.papyrus.umldi.InteractionOperand_Shape_CN" name="Interaction Operand Shape CN" hint="InteractionOperand_Shape_CN">
-    <iconEntry xmi:id="_r7iXcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionOperand.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionOperand"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadSelfActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadSelfActionInputShape" name="Input Pin Read Self Action Input Shape" hint="InputPin_ReadSelfActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJ7_0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionUse_Shape" identifier="org.eclipse.papyrus.umldi.InteractionUse_Shape" name="Interaction Use Shape" hint="InteractionUse_Shape">
-    <iconEntry xmi:id="_r4OkwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionUse"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionInputShape" name="Input Pin Read Structural Feature Action Input Shape" hint="InputPin_ReadStructuralFeatureActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sN_ZYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionUse_Shape_CN" identifier="org.eclipse.papyrus.umldi.InteractionUse_Shape_CN" name="Interaction Use Shape CN" hint="InteractionUse_Shape_CN">
-    <iconEntry xmi:id="_r78nINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionUse"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape" name="Input Pin Read Structural Feature Action Object Shape" hint="InputPin_ReadStructuralFeatureActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sN22gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interaction_ClassNestedClassifierLabel" name="Interaction Class Nested Classifier Label" hint="Interaction_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sbIdgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interaction_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReadVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReadVariableActionInputShape" name="Input Pin Read Variable Action Input Shape" hint="InputPin_ReadVariableActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPt3sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interaction_ComponentNestedClassifierLabel" name="Interaction Component Nested Classifier Label" hint="Interaction_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sbLg0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interaction_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionInputShape" name="Input Pin Reclassify Object Action Input Shape" hint="InputPin_ReclassifyObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sH9C0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interaction_InterfaceNestedClassifierLabel" name="Interaction Interface Nested Classifier Label" hint="Interaction_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sbN9ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interaction_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionObjectShape" name="Input Pin Reclassify Object Action Object Shape" hint="InputPin_ReclassifyObjectActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sH0f8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interaction_NestedClassifierLabel" name="Interaction Nested Classifier Label" hint="Interaction_NestedClassifierLabel">
-    <iconEntry xmi:id="_sbGBQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interaction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReduceActionCollectionShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReduceActionCollectionShape" name="Input Pin Reduce Action Collection Shape" hint="InputPin_ReduceActionCollectionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFnggNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Interaction_OwnedBehaviorLabel" name="Interaction Owned Behavior Label" hint="Interaction_OwnedBehaviorLabel">
-    <iconEntry xmi:id="_sjgWYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interaction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReduceActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReduceActionInputShape" name="Input Pin Reduce Action Input Shape" hint="InputPin_ReduceActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFwqcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_Shape" identifier="org.eclipse.papyrus.umldi.Interaction_Shape" name="Interaction Shape" hint="Interaction_Shape">
-    <iconEntry xmi:id="_rzQlMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interaction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionInputShape" name="Input Pin Remove Structural Feature Value Action Input Shape" hint="InputPin_RemoveStructuralFeatureValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHl2cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_Shape_CN" identifier="org.eclipse.papyrus.umldi.Interaction_Shape_CN" name="Interaction Shape CN" hint="Interaction_Shape_CN">
-    <iconEntry xmi:id="_r54xoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interaction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionObjectShape" name="Input Pin Remove Structural Feature Value Action Object Shape" hint="InputPin_RemoveStructuralFeatureValueActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHdTkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InterfaceRealization_Edge" identifier="org.eclipse.papyrus.umldi.InterfaceRealization_Edge" name="Interface Realization Edge" hint="InterfaceRealization_Edge">
-    <iconEntry xmi:id="_sW2acNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InterfaceRealization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionRemoveAtShape" name="Input Pin Remove Structural Feature Value Action Remove At Shape" hint="InputPin_RemoveStructuralFeatureValueActionRemoveAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHM04Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InterfaceRealization_Shape" identifier="org.eclipse.papyrus.umldi.InterfaceRealization_Shape" name="Interface Realization Shape" hint="InterfaceRealization_Shape">
-    <iconEntry xmi:id="_rz9IwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InterfaceRealization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveStructuralFeatureValueActionValueShape" name="Input Pin Remove Structural Feature Value Action Value Shape" hint="InputPin_RemoveStructuralFeatureValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHUwsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InterfaceRealization_Shape_CN" identifier="org.eclipse.papyrus.umldi.InterfaceRealization_Shape_CN" name="Interface Realization Shape CN" hint="InterfaceRealization_Shape_CN">
-    <iconEntry xmi:id="_r6vtQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InterfaceRealization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionInputShape" name="Input Pin Remove Variable Value Action Input Shape" hint="InputPin_RemoveVariableValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFb6UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interface_ClassNestedClassifierLabel" name="Interface Class Nested Classifier Label" hint="Interface_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sbTcoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionRemoveAtShape" name="Input Pin Remove Variable Value Action Remove At Shape" hint="InputPin_RemoveVariableValueActionRemoveAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFKNgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_ClassifierShape" identifier="org.eclipse.papyrus.umldi.Interface_ClassifierShape" name="Interface Classifier Shape" hint="Interface_ClassifierShape">
-    <iconEntry xmi:id="_r85pYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.InputPin_RemoveVariableValueActionValueShape" name="Input Pin Remove Variable Value Action Value Shape" hint="InputPin_RemoveVariableValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFT-gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_ClassifierShape_CN" identifier="org.eclipse.papyrus.umldi.Interface_ClassifierShape_CN" name="Interface Classifier Shape CN" hint="Interface_ClassifierShape_CN">
-    <iconEntry xmi:id="_r8_I8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReplyActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReplyActionInputShape" name="Input Pin Reply Action Input Shape" hint="InputPin_ReplyActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNrQUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interface_ComponentNestedClassifierLabel" name="Interface Component Nested Classifier Label" hint="Interface_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sbV44Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReplyActionReplyShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReplyActionReplyShape" name="Input Pin Reply Action Reply Shape" hint="InputPin_ReplyActionReplyShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNaKkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interface_InterfaceNestedClassifierLabel" name="Interface Interface Nested Classifier Label" hint="Interface_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sbY8MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Interface_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ReplyActionReturnShape" identifier="org.eclipse.papyrus.umldi.InputPin_ReplyActionReturnShape" name="Input Pin Reply Action Return Shape" hint="InputPin_ReplyActionReturnShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNitcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interface_NestedClassifierLabel" name="Interface Nested Classifier Label" hint="Interface_NestedClassifierLabel">
-    <iconEntry xmi:id="_sbRAYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendObjectActionInputShape" name="Input Pin Send Object Action Input Shape" hint="InputPin_SendObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEPngNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_Shape" identifier="org.eclipse.papyrus.umldi.Interface_Shape" name="Interface Shape" hint="Interface_Shape">
-    <iconEntry xmi:id="_r08AMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendObjectActionRequestShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendObjectActionRequestShape" name="Input Pin Send Object Action Request Shape" hint="InputPin_SendObjectActionRequestShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sD_I0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::object"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_Shape_CN" identifier="org.eclipse.papyrus.umldi.Interface_Shape_CN" name="Interface Shape CN" hint="Interface_Shape_CN">
-    <iconEntry xmi:id="_r70rUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendObjectActionTargetShape" name="Input Pin Send Object Action Target Shape" hint="InputPin_SendObjectActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEHrsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::SendObjectAction::request"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape" identifier="org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape" name="Interruptible Activity Region Shape" hint="InterruptibleActivityRegion_Shape">
-    <iconEntry xmi:id="_r37p0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InterruptibleActivityRegion"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape" name="Input Pin Send Signal Action Argument Shape" hint="InputPin_SendSignalActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEjwkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape_CN" identifier="org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape_CN" name="Interruptible Activity Region Shape CN" hint="InterruptibleActivityRegion_Shape_CN">
-    <iconEntry xmi:id="_r7kzsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InterruptibleActivityRegion"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendSignalActionInputShape" name="Input Pin Send Signal Action Input Shape" hint="InputPin_SendSignalActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEsTcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPostconditionShape" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPostconditionShape" name="Interval Constraint Local Postcondition Shape" hint="IntervalConstraint_LocalPostconditionShape">
-    <iconEntry xmi:id="_r9wlANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SendSignalActionTargetShape" identifier="org.eclipse.papyrus.umldi.InputPin_SendSignalActionTargetShape" name="Input Pin Send Signal Action Target Shape" hint="InputPin_SendSignalActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEbNsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::SendSignalAction::target"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPreconditionShape" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPreconditionShape" name="Interval Constraint Local Precondition Shape" hint="IntervalConstraint_LocalPreconditionShape">
-    <iconEntry xmi:id="_r-EuENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_SequenceNodeInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_SequenceNodeInputShape" name="Input Pin Sequence Node Input Shape" hint="InputPin_SequenceNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGUEENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_PostconditionLabel" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_PostconditionLabel" name="Interval Constraint Postcondition Label" hint="IntervalConstraint_PostconditionLabel">
-    <iconEntry xmi:id="_sgzAoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_Shape" identifier="org.eclipse.papyrus.umldi.InputPin_Shape" name="Input Pin Shape" hint="InputPin_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4mYMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_PreconditionLabel" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_PreconditionLabel" name="Interval Constraint Precondition Label" hint="IntervalConstraint_PreconditionLabel">
-    <iconEntry xmi:id="_shOecNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionInputShape" name="Input Pin Start Classifier Behavior Action Input Shape" hint="InputPin_StartClassifierBehaviorActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJFEMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_Shape" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_Shape" name="Interval Constraint Shape" hint="IntervalConstraint_Shape">
-    <iconEntry xmi:id="_r3uOcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionObjectShape" name="Input Pin Start Classifier Behavior Action Object Shape" hint="InputPin_StartClassifierBehaviorActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sI9IYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_Shape_CN" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_Shape_CN" name="Interval Constraint Shape CN" hint="IntervalConstraint_Shape_CN">
-    <iconEntry xmi:id="_r7X_YNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape" name="Input Pin Start Object Behavior Action Argument Shape" hint="InputPin_StartObjectBehaviorActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sK96kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interval_Shape" identifier="org.eclipse.papyrus.umldi.Interval_Shape" name="Interval Shape" hint="Interval_Shape">
-    <iconEntry xmi:id="_sA28UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interval"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionInputShape" name="Input Pin Start Object Behavior Action Input Shape" hint="InputPin_StartObjectBehaviorActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLF2YNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.JoinNode_JoinSpecLabel" identifier="org.eclipse.papyrus.umldi.JoinNode_JoinSpecLabel" name="Join Node Join Spec Label" hint="JoinNode_JoinSpecLabel">
-    <iconEntry xmi:id="_sk-WANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.JoinNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionObjectShape" name="Input Pin Start Object Behavior Action Object Shape" hint="InputPin_StartObjectBehaviorActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sK1XsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::StartObjectBehaviorAction::object"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.JoinNode_Shape" identifier="org.eclipse.papyrus.umldi.JoinNode_Shape" name="Join Node Shape" hint="JoinNode_Shape">
-    <iconEntry xmi:id="_rzfOsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.JoinNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_StructuredActivityNodeInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_StructuredActivityNodeInputShape" name="Input Pin Structured Activity Node Input Shape" hint="InputPin_StructuredActivityNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDbvMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Lifeline_CompactShape" identifier="org.eclipse.papyrus.umldi.Lifeline_CompactShape" name="Lifeline Compact Shape" hint="Lifeline_CompactShape">
-    <iconEntry xmi:id="_sRWPYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Lifeline.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Lifeline"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionFirstShape" identifier="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionFirstShape" name="Input Pin Test Identity Action First Shape" hint="InputPin_TestIdentityActionFirstShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sCzdENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Lifeline_FullShape" identifier="org.eclipse.papyrus.umldi.Lifeline_FullShape" name="Lifeline Full Shape" hint="Lifeline_FullShape">
-    <iconEntry xmi:id="_sRQv0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Lifeline.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Lifeline"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionInputShape" name="Input Pin Test Identity Action Input Shape" hint="InputPin_TestIdentityActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDKCYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Lifeline_Shape" identifier="org.eclipse.papyrus.umldi.Lifeline_Shape" name="Lifeline Shape" hint="Lifeline_Shape">
-    <iconEntry xmi:id="_r3dvwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Lifeline.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Lifeline"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionSecondShape" identifier="org.eclipse.papyrus.umldi.InputPin_TestIdentityActionSecondShape" name="Input Pin Test Identity Action Second Shape" hint="InputPin_TestIdentityActionSecondShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDA4cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin_As_UML::TestIdentityAction::second"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Lifeline_Shape_CN" identifier="org.eclipse.papyrus.umldi.Lifeline_Shape_CN" name="Lifeline Shape CN" hint="Lifeline_Shape_CN">
-    <iconEntry xmi:id="_r7NAQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Lifeline.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Lifeline"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_UnmarshallActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_UnmarshallActionInputShape" name="Input Pin Unmarshall Action Input Shape" hint="InputPin_UnmarshallActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMJmUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Link_DescriptorEdge" identifier="org.eclipse.papyrus.umldi.Link_DescriptorEdge" name="Link Descriptor Edge" hint="Link_DescriptorEdge">
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_UnmarshallActionObjectShape" identifier="org.eclipse.papyrus.umldi.InputPin_UnmarshallActionObjectShape" name="Input Pin Unmarshall Action Object Shape" hint="InputPin_UnmarshallActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMBDcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Link_InterfacePortEdge" identifier="org.eclipse.papyrus.umldi.Link_InterfacePortEdge" name="Link Interface Port Edge" hint="Link_InterfacePortEdge">
-    <iconEntry xmi:id="_sYh1cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InputPin_ValueSpecificationActionInputShape" identifier="org.eclipse.papyrus.umldi.InputPin_ValueSpecificationActionInputShape" name="Input Pin Value Specification Action Input Shape" hint="InputPin_ValueSpecificationActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sP76INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralBoolean_Shape" identifier="org.eclipse.papyrus.umldi.LiteralBoolean_Shape" name="Literal Boolean Shape" hint="LiteralBoolean_Shape">
-    <iconEntry xmi:id="_sAl2kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralBoolean.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralBoolean"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InstanceSpecification_DeployedArtifactLabel" identifier="org.eclipse.papyrus.umldi.InstanceSpecification_DeployedArtifactLabel" name="Instance Specification Deployed Artifact Label" hint="InstanceSpecification_DeployedArtifactLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sifpwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralInteger_Shape" identifier="org.eclipse.papyrus.umldi.LiteralInteger_Shape" name="Literal Integer Shape" hint="LiteralInteger_Shape">
-    <iconEntry xmi:id="_sA8b4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralInteger.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralInteger"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InstanceSpecification_Edge" identifier="org.eclipse.papyrus.umldi.InstanceSpecification_Edge" name="Instance Specification Edge" hint="InstanceSpecification_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sXxAcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification.Link"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralNull_Shape" identifier="org.eclipse.papyrus.umldi.LiteralNull_Shape" name="Literal Null Shape" hint="LiteralNull_Shape">
-    <iconEntry xmi:id="_sAr9MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralNull.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralNull"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InstanceSpecification_Shape" identifier="org.eclipse.papyrus.umldi.InstanceSpecification_Shape" name="Instance Specification Shape" hint="InstanceSpecification_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0AMENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralReal_Shape" identifier="org.eclipse.papyrus.umldi.LiteralReal_Shape" name="Literal Real Shape" hint="LiteralReal_Shape">
-    <iconEntry xmi:id="_sAd6wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralReal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralReal"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InstanceSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.InstanceSpecification_Shape_CN" name="Instance Specification Shape CN" hint="InstanceSpecification_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r60lwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InstanceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralString_Shape" identifier="org.eclipse.papyrus.umldi.LiteralString_Shape" name="Literal String Shape" hint="LiteralString_Shape">
-    <iconEntry xmi:id="_sA5YkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralString.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralString"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InstanceValue_Shape" identifier="org.eclipse.papyrus.umldi.InstanceValue_Shape" name="Instance Value Shape" hint="InstanceValue_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAYbMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InstanceValue.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InstanceValue"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralUnlimitedNatural_Shape" identifier="org.eclipse.papyrus.umldi.LiteralUnlimitedNatural_Shape" name="Literal Unlimited Natural Shape" hint="LiteralUnlimitedNatural_Shape">
-    <iconEntry xmi:id="_sAo54Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralUnlimitedNatural.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralUnlimitedNatural"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionConstraint_PostconditionLabel" identifier="org.eclipse.papyrus.umldi.InteractionConstraint_PostconditionLabel" name="Interaction Constraint Postcondition Label" hint="InteractionConstraint_PostconditionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sgrE0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LoopNode_Shape" identifier="org.eclipse.papyrus.umldi.LoopNode_Shape" name="Loop Node Shape" hint="LoopNode_Shape">
-    <iconEntry xmi:id="_r3ou4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LoopNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LoopNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionConstraint_PreconditionLabel" identifier="org.eclipse.papyrus.umldi.InteractionConstraint_PreconditionLabel" name="Interaction Constraint Precondition Label" hint="InteractionConstraint_PreconditionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_shF7kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Manifestation_Edge" identifier="org.eclipse.papyrus.umldi.Manifestation_Edge" name="Manifestation Edge" hint="Manifestation_Edge">
-    <iconEntry xmi:id="_sVtyANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Manifestation"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionConstraint_Shape" identifier="org.eclipse.papyrus.umldi.InteractionConstraint_Shape" name="Interaction Constraint Shape" hint="InteractionConstraint_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1nVoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Manifestation_Shape" identifier="org.eclipse.papyrus.umldi.Manifestation_Shape" name="Manifestation Shape" hint="Manifestation_Shape">
-    <iconEntry xmi:id="_r1wfkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Manifestation"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionConstraint_Shape_CN" identifier="org.eclipse.papyrus.umldi.InteractionConstraint_Shape_CN" name="Interaction Constraint Shape CN" hint="InteractionConstraint_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5QfgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Manifestation_Shape_CN" identifier="org.eclipse.papyrus.umldi.Manifestation_Shape_CN" name="Manifestation Shape CN" hint="Manifestation_Shape_CN">
-    <iconEntry xmi:id="_r5YbUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Manifestation"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionOperand_Shape" identifier="org.eclipse.papyrus.umldi.InteractionOperand_Shape" name="Interaction Operand Shape" hint="InteractionOperand_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0hJcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionOperand.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionOperand"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.MergeNode_Shape" identifier="org.eclipse.papyrus.umldi.MergeNode_Shape" name="Merge Node Shape" hint="MergeNode_Shape">
-    <iconEntry xmi:id="_r2ccENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/MergeNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.MergeNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionOperand_Shape_CN" identifier="org.eclipse.papyrus.umldi.InteractionOperand_Shape_CN" name="Interaction Operand Shape CN" hint="InteractionOperand_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7iXcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionOperand.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionOperand"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.MessageOccurrenceSpecification_Shape" identifier="org.eclipse.papyrus.umldi.MessageOccurrenceSpecification_Shape" name="Message Occurrence Specification Shape" hint="MessageOccurrenceSpecification_Shape">
-    <iconEntry xmi:id="_r0_DgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/MessageOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.MessageOccurrenceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionUse_Shape" identifier="org.eclipse.papyrus.umldi.InteractionUse_Shape" name="Interaction Use Shape" hint="InteractionUse_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4OkwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionUse"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.MessageOccurrenceSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.MessageOccurrenceSpecification_Shape_CN" name="Message Occurrence Specification Shape CN" hint="MessageOccurrenceSpecification_Shape_CN">
-    <iconEntry xmi:id="_r73uoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/MessageOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.MessageOccurrenceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InteractionUse_Shape_CN" identifier="org.eclipse.papyrus.umldi.InteractionUse_Shape_CN" name="Interaction Use Shape CN" hint="InteractionUse_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r78nINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InteractionUse.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InteractionUse"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_AsynchEdge" identifier="org.eclipse.papyrus.umldi.Message_AsynchEdge" name="Message Asynch Edge" hint="Message_AsynchEdge">
-    <iconEntry xmi:id="_sYPhkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CompleteAsynchMessage"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interaction_ClassNestedClassifierLabel" name="Interaction Class Nested Classifier Label" hint="Interaction_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Interaction_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbIdgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_CreateEdge" identifier="org.eclipse.papyrus.umldi.Message_CreateEdge" name="Message Create Edge" hint="Message_CreateEdge">
-    <iconEntry xmi:id="_sYVoMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CompleteCreateMessage"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interaction_ComponentNestedClassifierLabel" name="Interaction Component Nested Classifier Label" hint="Interaction_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Interaction_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbLg0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_DeleteEdge" identifier="org.eclipse.papyrus.umldi.Message_DeleteEdge" name="Message Delete Edge" hint="Message_DeleteEdge">
-    <iconEntry xmi:id="_sYYEcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CompleteDeleteMessage"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interaction_InterfaceNestedClassifierLabel" name="Interaction Interface Nested Classifier Label" hint="Interaction_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Interaction_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbN9ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_Edge" identifier="org.eclipse.papyrus.umldi.Message_Edge" name="Message Edge" hint="Message_Edge">
-    <iconEntry xmi:id="_sVoScNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Message"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interaction_NestedClassifierLabel" name="Interaction Nested Classifier Label" hint="Interaction_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbGBQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interaction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_FoundEdge" identifier="org.eclipse.papyrus.umldi.Message_FoundEdge" name="Message Found Edge" hint="Message_FoundEdge">
-    <iconEntry xmi:id="_sYdkANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FoundAsynchMessage"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.Interaction_OwnedBehaviorLabel" name="Interaction Owned Behavior Label" hint="Interaction_OwnedBehaviorLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sjgWYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interaction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_LostEdge" identifier="org.eclipse.papyrus.umldi.Message_LostEdge" name="Message Lost Edge" hint="Message_LostEdge">
-    <iconEntry xmi:id="_sYbHwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LostAsynchMessage"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_Shape" identifier="org.eclipse.papyrus.umldi.Interaction_Shape" name="Interaction Shape" hint="Interaction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzQlMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interaction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_ReplyEdge" identifier="org.eclipse.papyrus.umldi.Message_ReplyEdge" name="Message Reply Edge" hint="Message_ReplyEdge">
-    <iconEntry xmi:id="_sYSk4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CompleteReplyMessage"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interaction_Shape_CN" identifier="org.eclipse.papyrus.umldi.Interaction_Shape_CN" name="Interaction Shape CN" hint="Interaction_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r54xoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interaction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interaction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_SynchEdge" identifier="org.eclipse.papyrus.umldi.Message_SynchEdge" name="Message Synch Edge" hint="Message_SynchEdge">
-    <iconEntry xmi:id="_sYNFUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CompleteSynchMessage"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InterfaceRealization_Edge" identifier="org.eclipse.papyrus.umldi.InterfaceRealization_Edge" name="Interface Realization Edge" hint="InterfaceRealization_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sW2acNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InterfaceRealization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Model_Shape" identifier="org.eclipse.papyrus.umldi.Model_Shape" name="Model Shape" hint="Model_Shape">
-    <iconEntry xmi:id="_r24g8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Model"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InterfaceRealization_Shape" identifier="org.eclipse.papyrus.umldi.InterfaceRealization_Shape" name="Interface Realization Shape" hint="InterfaceRealization_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rz9IwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InterfaceRealization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Model_Shape_CN" identifier="org.eclipse.papyrus.umldi.Model_Shape_CN" name="Model Shape CN" hint="Model_Shape_CN">
-    <iconEntry xmi:id="_r63pENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Model"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InterfaceRealization_Shape_CN" identifier="org.eclipse.papyrus.umldi.InterfaceRealization_Shape_CN" name="Interface Realization Shape CN" hint="InterfaceRealization_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6vtQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InterfaceRealization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.InterfaceRealization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.NamedElement_DefaultShape" identifier="org.eclipse.papyrus.umldi.NamedElement_DefaultShape" name="Named Element Default Shape" hint="NamedElement_DefaultShape">
-    <iconEntry xmi:id="_sRyUQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/NamedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.NamedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interface_ClassNestedClassifierLabel" name="Interface Class Nested Classifier Label" hint="Interface_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Interface_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbTcoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Node_ClassNestedClassifierLabel" name="Node Class Nested Classifier Label" hint="Node_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sedeUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_ClassifierShape" identifier="org.eclipse.papyrus.umldi.Interface_ClassifierShape" name="Interface Classifier Shape" hint="Interface_ClassifierShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r85pYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Node_ComponentNestedClassifierLabel" name="Node Component Nested Classifier Label" hint="Node_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_seghoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_ClassifierShape_CN" identifier="org.eclipse.papyrus.umldi.Interface_ClassifierShape_CN" name="Interface Classifier Shape CN" hint="Interface_ClassifierShape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8_I8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_FreeTimeRulerShape" identifier="org.eclipse.papyrus.umldi.Node_FreeTimeRulerShape" name="Node Free Time Ruler Shape" hint="Node_FreeTimeRulerShape">
-    <iconEntry xmi:id="_sRmuENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interface_ComponentNestedClassifierLabel" name="Interface Component Nested Classifier Label" hint="Interface_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Interface_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbV44Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Node_InterfaceNestedClassifierLabel" name="Node Interface Nested Classifier Label" hint="Node_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sejk8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Node_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interface_InterfaceNestedClassifierLabel" name="Interface Interface Nested Classifier Label" hint="Interface_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Interface_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbY8MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_LinearTimeRulerShape" identifier="org.eclipse.papyrus.umldi.Node_LinearTimeRulerShape" name="Node Linear Time Ruler Shape" hint="Node_LinearTimeRulerShape">
-    <iconEntry xmi:id="_sRojQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Interface_NestedClassifierLabel" name="Interface Nested Classifier Label" hint="Interface_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbRAYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Node_NestedClassifierLabel" name="Node Nested Classifier Label" hint="Node_NestedClassifierLabel">
-    <iconEntry xmi:id="_sebCENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Node"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_Shape" identifier="org.eclipse.papyrus.umldi.Interface_Shape" name="Interface Shape" hint="Interface_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r08AMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_NestedNodeLabel" identifier="org.eclipse.papyrus.umldi.Node_NestedNodeLabel" name="Node Nested Node Label" hint="Node_NestedNodeLabel">
-    <iconEntry xmi:id="_sjOCgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Node"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interface_Shape_CN" identifier="org.eclipse.papyrus.umldi.Interface_Shape_CN" name="Interface Shape CN" hint="Interface_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r70rUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interface"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_Shape" identifier="org.eclipse.papyrus.umldi.Node_Shape" name="Node Shape" hint="Node_Shape">
-    <iconEntry xmi:id="_r0DPYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Node"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape" identifier="org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape" name="Interruptible Activity Region Shape" hint="InterruptibleActivityRegion_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r37p0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Node_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Node_Shape_CCN" name="Node Shape CCN" hint="Node_Shape_CCN">
-    <iconEntry xmi:id="_r-x4sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.um.Node_As_UML::Node::nestedNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape_CN" identifier="org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape_CN" name="Interruptible Activity Region Shape CN" hint="InterruptibleActivityRegion_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7kzsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Node_Shape_CN" identifier="org.eclipse.papyrus.umldi.Node_Shape_CN" name="Node Shape CN" hint="Node_Shape_CN">
-    <iconEntry xmi:id="_r7CBINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Node"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPostconditionShape" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPostconditionShape" name="Interval Constraint Local Postcondition Shape" hint="IntervalConstraint_LocalPostconditionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r9wlANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_StateDefinitionShape" identifier="org.eclipse.papyrus.umldi.Node_StateDefinitionShape" name="Node State Definition Shape" hint="Node_StateDefinitionShape">
-    <iconEntry xmi:id="_sRicoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPreconditionShape" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPreconditionShape" name="Interval Constraint Local Precondition Shape" hint="IntervalConstraint_LocalPreconditionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-EuENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint_As_UML::Action::localPrecondition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_StateInvariantTransitionShape" identifier="org.eclipse.papyrus.umldi.Node_StateInvariantTransitionShape" name="Node State Invariant Transition Shape" hint="Node_StateInvariantTransitionShape">
-    <iconEntry xmi:id="_sRk44Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_PostconditionLabel" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_PostconditionLabel" name="Interval Constraint Postcondition Label" hint="IntervalConstraint_PostconditionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sgzAoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_TickShape" identifier="org.eclipse.papyrus.umldi.Node_TickShape" name="Node Tick Shape" hint="Node_TickShape">
-    <iconEntry xmi:id="_sRq_gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_PreconditionLabel" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_PreconditionLabel" name="Interval Constraint Precondition Label" hint="IntervalConstraint_PreconditionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_shOecNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ObjectFlow_Edge" identifier="org.eclipse.papyrus.umldi.ObjectFlow_Edge" name="Object Flow Edge" hint="ObjectFlow_Edge">
-    <iconEntry xmi:id="_sWXSQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ObjectFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ObjectFlow"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_Shape" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_Shape" name="Interval Constraint Shape" hint="IntervalConstraint_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3uOcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OccurrenceSpecification_Shape" identifier="org.eclipse.papyrus.umldi.OccurrenceSpecification_Shape" name="Occurrence Specification Shape" hint="OccurrenceSpecification_Shape">
-    <iconEntry xmi:id="_rzcLYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OccurrenceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.IntervalConstraint_Shape_CN" identifier="org.eclipse.papyrus.umldi.IntervalConstraint_Shape_CN" name="Interval Constraint Shape CN" hint="IntervalConstraint_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7X_YNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/IntervalConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.IntervalConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OccurrenceSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.OccurrenceSpecification_Shape_CN" name="Occurrence Specification Shape CN" hint="OccurrenceSpecification_Shape_CN">
-    <iconEntry xmi:id="_r6DwwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OccurrenceSpecification"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Interval_Shape" identifier="org.eclipse.papyrus.umldi.Interval_Shape" name="Interval Shape" hint="Interval_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sA28UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Interval"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueAction_Shape" identifier="org.eclipse.papyrus.umldi.OpaqueAction_Shape" name="Opaque Action Shape" hint="OpaqueAction_Shape">
-    <iconEntry xmi:id="_rzoYoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.JoinNode_JoinSpecLabel" identifier="org.eclipse.papyrus.umldi.JoinNode_JoinSpecLabel" name="Join Node Join Spec Label" hint="JoinNode_JoinSpecLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sk-WANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.OpaqueBehavior_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_ClassNestedClassifierLabel" name="Opaque Behavior Class Nested Classifier Label" hint="OpaqueBehavior_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sdZuYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueBehavior_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.JoinNode_Shape" identifier="org.eclipse.papyrus.umldi.JoinNode_Shape" name="Join Node Shape" hint="JoinNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzfOsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/JoinNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.OpaqueBehavior_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_ComponentNestedClassifierLabel" name="Opaque Behavior Component Nested Classifier Label" hint="OpaqueBehavior_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sdcxsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueBehavior_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Lifeline_CompactShape" identifier="org.eclipse.papyrus.umldi.Lifeline_CompactShape" name="Lifeline Compact Shape" hint="Lifeline_CompactShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRWPYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Lifeline.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Lifeline"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_InterfaceNestedClassifierLabel" name="Opaque Behavior Interface Nested Classifier Label" hint="OpaqueBehavior_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sdf1ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.OpaqueBehavior_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Lifeline_FullShape" identifier="org.eclipse.papyrus.umldi.Lifeline_FullShape" name="Lifeline Full Shape" hint="Lifeline_FullShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRQv0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Lifeline.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Lifeline"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_NestedClassifierLabel" name="Opaque Behavior Nested Classifier Label" hint="OpaqueBehavior_NestedClassifierLabel">
-    <iconEntry xmi:id="_sdWrENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueBehavior"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Lifeline_Shape" identifier="org.eclipse.papyrus.umldi.Lifeline_Shape" name="Lifeline Shape" hint="Lifeline_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3dvwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Lifeline.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Lifeline"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_OwnedBehaviorLabel" name="Opaque Behavior Owned Behavior Label" hint="OpaqueBehavior_OwnedBehaviorLabel">
-    <iconEntry xmi:id="_sjpgUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueBehavior"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Lifeline_Shape_CN" identifier="org.eclipse.papyrus.umldi.Lifeline_Shape_CN" name="Lifeline Shape CN" hint="Lifeline_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7NAQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Lifeline.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Lifeline"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_Shape" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_Shape" name="Opaque Behavior Shape" hint="OpaqueBehavior_Shape">
-    <iconEntry xmi:id="_r4pbgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueBehavior"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Link_DescriptorEdge" identifier="org.eclipse.papyrus.umldi.Link_DescriptorEdge" name="Link Descriptor Edge" hint="Link_DescriptorEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Link_InterfacePortEdge" identifier="org.eclipse.papyrus.umldi.Link_InterfacePortEdge" name="Link Interface Port Edge" hint="Link_InterfacePortEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYh1cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_Shape_CN" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_Shape_CN" name="Opaque Behavior Shape CN" hint="OpaqueBehavior_Shape_CN">
-    <iconEntry xmi:id="_r8VBoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueBehavior"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralBoolean_Shape" identifier="org.eclipse.papyrus.umldi.LiteralBoolean_Shape" name="Literal Boolean Shape" hint="LiteralBoolean_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAl2kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralBoolean.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralBoolean"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueExpression_Shape" identifier="org.eclipse.papyrus.umldi.OpaqueExpression_Shape" name="Opaque Expression Shape" hint="OpaqueExpression_Shape">
-    <iconEntry xmi:id="_sAz5ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueExpression"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralInteger_Shape" identifier="org.eclipse.papyrus.umldi.LiteralInteger_Shape" name="Literal Integer Shape" hint="LiteralInteger_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sA8b4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralInteger.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralInteger"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OperationTemplateParameter_TemplateParameterLabel" identifier="org.eclipse.papyrus.umldi.OperationTemplateParameter_TemplateParameterLabel" name="Operation Template Parameter Template Parameter Label" hint="OperationTemplateParameter_TemplateParameterLabel">
-    <iconEntry xmi:id="_sh3XoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OperationTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OperationTemplateParameter"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralNull_Shape" identifier="org.eclipse.papyrus.umldi.LiteralNull_Shape" name="Literal Null Shape" hint="LiteralNull_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAr9MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralNull.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralNull"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_ClassOperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_ClassOperationLabel" name="Operation Class Operation Label" hint="Operation_ClassOperationLabel">
-    <iconEntry xmi:id="_saBDMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_OperationLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralReal_Shape" identifier="org.eclipse.papyrus.umldi.LiteralReal_Shape" name="Literal Real Shape" hint="LiteralReal_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAd6wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralReal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralReal"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel" name="Operation Component Operation Label" hint="Operation_ComponentOperationLabel">
-    <iconEntry xmi:id="_saGiwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_OperationLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralString_Shape" identifier="org.eclipse.papyrus.umldi.LiteralString_Shape" name="Literal String Shape" hint="LiteralString_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sA5YkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralString.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralString"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel" name="Operation Data Type Operation Label" hint="Operation_DataTypeOperationLabel">
-    <iconEntry xmi:id="_sZ9_4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_OperationLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LiteralUnlimitedNatural_Shape" identifier="org.eclipse.papyrus.umldi.LiteralUnlimitedNatural_Shape" name="Literal Unlimited Natural Shape" hint="LiteralUnlimitedNatural_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAo54Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LiteralUnlimitedNatural.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LiteralUnlimitedNatural"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel" name="Operation Interface Operation Label" hint="Operation_InterfaceOperationLabel">
-    <iconEntry xmi:id="_saJmENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_OperationLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.LoopNode_Shape" identifier="org.eclipse.papyrus.umldi.LoopNode_Shape" name="Loop Node Shape" hint="LoopNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3ou4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/LoopNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LoopNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_OperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_OperationLabel" name="Operation Operation Label" hint="Operation_OperationLabel">
-    <iconEntry xmi:id="_sZ7joNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Operation"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Manifestation_Edge" identifier="org.eclipse.papyrus.umldi.Manifestation_Edge" name="Manifestation Edge" hint="Manifestation_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sVtyANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Manifestation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel" name="Operation Primitive Type Operation Label" hint="Operation_PrimitiveTypeOperationLabel">
-    <iconEntry xmi:id="_saEGgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Operation_OperationLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Manifestation_Shape" identifier="org.eclipse.papyrus.umldi.Manifestation_Shape" name="Manifestation Shape" hint="Manifestation_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1wfkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Manifestation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionOutputShape" name="Output Pin Accept Call Action Output Shape" hint="OutputPin_AcceptCallActionOutputShape">
-    <iconEntry xmi:id="_sKxtUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Manifestation_Shape_CN" identifier="org.eclipse.papyrus.umldi.Manifestation_Shape_CN" name="Manifestation Shape CN" hint="Manifestation_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5YbUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Manifestation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Manifestation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionResultShape" name="Output Pin Accept Call Action Result Shape" hint="OutputPin_AcceptCallActionResultShape">
-    <iconEntry xmi:id="_sKuqANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.MergeNode_Shape" identifier="org.eclipse.papyrus.umldi.MergeNode_Shape" name="Merge Node Shape" hint="MergeNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2ccENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/MergeNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.OutputPin_AcceptCallActionReturnShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionReturnShape" name="Output Pin Accept Call Action Return Shape" hint="OutputPin_AcceptCallActionReturnShape">
-    <iconEntry xmi:id="_sKrmsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.MessageOccurrenceSpecification_Shape" identifier="org.eclipse.papyrus.umldi.MessageOccurrenceSpecification_Shape" name="Message Occurrence Specification Shape" hint="MessageOccurrenceSpecification_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0_DgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/MessageOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.MessageOccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionOutputShape" name="Output Pin Accept Event Action Output Shape" hint="OutputPin_AcceptEventActionOutputShape">
-    <iconEntry xmi:id="_sI6FENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.MessageOccurrenceSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.MessageOccurrenceSpecification_Shape_CN" name="Message Occurrence Specification Shape CN" hint="MessageOccurrenceSpecification_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r73uoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/MessageOccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.MessageOccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape" name="Output Pin Accept Event Action Result Shape" hint="OutputPin_AcceptEventActionResultShape">
-    <iconEntry xmi:id="_sI3BwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_AsynchEdge" identifier="org.eclipse.papyrus.umldi.Message_AsynchEdge" name="Message Asynch Edge" hint="Message_AsynchEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYPhkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CompleteAsynchMessage"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionOutputShape" name="Output Pin Add Structural Feature Value Action Output Shape" hint="OutputPin_AddStructuralFeatureValueActionOutputShape">
-    <iconEntry xmi:id="_sNLhENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_CreateEdge" identifier="org.eclipse.papyrus.umldi.Message_CreateEdge" name="Message Create Edge" hint="Message_CreateEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYVoMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CompleteCreateMessage"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape" name="Output Pin Add Structural Feature Value Action Result Shape" hint="OutputPin_AddStructuralFeatureValueActionResultShape">
-    <iconEntry xmi:id="_sNIdwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_DeleteEdge" identifier="org.eclipse.papyrus.umldi.Message_DeleteEdge" name="Message Delete Edge" hint="Message_DeleteEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYYEcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CompleteDeleteMessage"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AddVariableValueActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AddVariableValueActionOutputShape" name="Output Pin Add Variable Value Action Output Shape" hint="OutputPin_AddVariableValueActionOutputShape">
-    <iconEntry xmi:id="_sPqNUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_Edge" identifier="org.eclipse.papyrus.umldi.Message_Edge" name="Message Edge" hint="Message_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sVoScNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Message"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_BroadcastSignalActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_BroadcastSignalActionOutputShape" name="Output Pin Broadcast Signal Action Output Shape" hint="OutputPin_BroadcastSignalActionOutputShape">
-    <iconEntry xmi:id="_sLmMsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_FoundEdge" identifier="org.eclipse.papyrus.umldi.Message_FoundEdge" name="Message Found Edge" hint="Message_FoundEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYdkANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.FoundAsynchMessage"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionOutputShape" name="Output Pin Call Behavior Action Output Shape" hint="OutputPin_CallBehaviorActionOutputShape">
-    <iconEntry xmi:id="_sIcLANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_LostEdge" identifier="org.eclipse.papyrus.umldi.Message_LostEdge" name="Message Lost Edge" hint="Message_LostEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYbHwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.LostAsynchMessage"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape" name="Output Pin Call Behavior Action Result Shape" hint="OutputPin_CallBehaviorActionResultShape">
-    <iconEntry xmi:id="_sIZuwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_ReplyEdge" identifier="org.eclipse.papyrus.umldi.Message_ReplyEdge" name="Message Reply Edge" hint="Message_ReplyEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYSk4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CompleteReplyMessage"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CallOperationActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CallOperationActionOutputShape" name="Output Pin Call Operation Action Output Shape" hint="OutputPin_CallOperationActionOutputShape">
-    <iconEntry xmi:id="_sJtWUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Message_SynchEdge" identifier="org.eclipse.papyrus.umldi.Message_SynchEdge" name="Message Synch Edge" hint="Message_SynchEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYNFUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Message.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.CompleteSynchMessage"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape" name="Output Pin Call Operation Action Result Shape" hint="OutputPin_CallOperationActionResultShape">
-    <iconEntry xmi:id="_sJqTANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Model_Shape" identifier="org.eclipse.papyrus.umldi.Model_Shape" name="Model Shape" hint="Model_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r24g8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Model"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ClearAssociationActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ClearAssociationActionOutputShape" name="Output Pin Clear Association Action Output Shape" hint="OutputPin_ClearAssociationActionOutputShape">
-    <iconEntry xmi:id="_sGQZsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Model_Shape_CN" identifier="org.eclipse.papyrus.umldi.Model_Shape_CN" name="Model Shape CN" hint="Model_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r63pENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Model.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Model"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionOutputShape" name="Output Pin Clear Structural Feature Action Output Shape" hint="OutputPin_ClearStructuralFeatureActionOutputShape">
-    <iconEntry xmi:id="_sOhk4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.NamedElement_DefaultShape" identifier="org.eclipse.papyrus.umldi.NamedElement_DefaultShape" name="Named Element Default Shape" hint="NamedElement_DefaultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRyUQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/NamedElement.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.NamedElement"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionResultShape" name="Output Pin Clear Structural Feature Action Result Shape" hint="OutputPin_ClearStructuralFeatureActionResultShape">
-    <iconEntry xmi:id="_sOehkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Node_ClassNestedClassifierLabel" name="Node Class Nested Classifier Label" hint="Node_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Node_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sedeUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ClearVariableActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ClearVariableActionOutputShape" name="Output Pin Clear Variable Action Output Shape" hint="OutputPin_ClearVariableActionOutputShape">
-    <iconEntry xmi:id="_sPM6UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Node_ComponentNestedClassifierLabel" name="Node Component Nested Classifier Label" hint="Node_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Node_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seghoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ConditionalNodeOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ConditionalNodeOutputShape" name="Output Pin Conditional Node Output Shape" hint="OutputPin_ConditionalNodeOutputShape">
-    <iconEntry xmi:id="_sIrbkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_FreeTimeRulerShape" identifier="org.eclipse.papyrus.umldi.Node_FreeTimeRulerShape" name="Node Free Time Ruler Shape" hint="Node_FreeTimeRulerShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRmuENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ConditionalNodeResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ConditionalNodeResultShape" name="Output Pin Conditional Node Result Shape" hint="OutputPin_ConditionalNodeResultShape">
-    <iconEntry xmi:id="_sIoYQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Node_InterfaceNestedClassifierLabel" name="Node Interface Nested Classifier Label" hint="Node_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Node_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sejk8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CreateLinkActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CreateLinkActionOutputShape" name="Output Pin Create Link Action Output Shape" hint="OutputPin_CreateLinkActionOutputShape">
-    <iconEntry xmi:id="_sHJKgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_LinearTimeRulerShape" identifier="org.eclipse.papyrus.umldi.Node_LinearTimeRulerShape" name="Node Linear Time Ruler Shape" hint="Node_LinearTimeRulerShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRojQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionOutputShape" name="Output Pin Create Link Object Action Output Shape" hint="OutputPin_CreateLinkObjectActionOutputShape">
-    <iconEntry xmi:id="_sQ6KgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Node_NestedClassifierLabel" name="Node Nested Classifier Label" hint="Node_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sebCENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Node"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionResultShape" name="Output Pin Create Link Object Action Result Shape" hint="OutputPin_CreateLinkObjectActionResultShape">
-    <iconEntry xmi:id="_sQ3HMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_NestedNodeLabel" identifier="org.eclipse.papyrus.umldi.Node_NestedNodeLabel" name="Node Nested Node Label" hint="Node_NestedNodeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sjOCgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Node"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionOutputShape" name="Output Pin Create Object Action Output Shape" hint="OutputPin_CreateObjectActionOutputShape">
-    <iconEntry xmi:id="_sQWJ0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_Shape" identifier="org.eclipse.papyrus.umldi.Node_Shape" name="Node Shape" hint="Node_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0DPYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Node"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionResultShape" name="Output Pin Create Object Action Result Shape" hint="OutputPin_CreateObjectActionResultShape">
-    <iconEntry xmi:id="_sQTtkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_Shape_CCN" identifier="org.eclipse.papyrus.umldi.Node_Shape_CCN" name="Node Shape CCN" hint="Node_Shape_CCN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-x4sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.um.Node_As_UML::Node::nestedNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_DestroyLinkActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_DestroyLinkActionOutputShape" name="Output Pin Destroy Link Action Output Shape" hint="OutputPin_DestroyLinkActionOutputShape">
-    <iconEntry xmi:id="_sNXHQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_Shape_CN" identifier="org.eclipse.papyrus.umldi.Node_Shape_CN" name="Node Shape CN" hint="Node_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7CBINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Node"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_DestroyObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_DestroyObjectActionOutputShape" name="Output Pin Destroy Object Action Output Shape" hint="OutputPin_DestroyObjectActionOutputShape">
-    <iconEntry xmi:id="_sO1t8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_StateDefinitionShape" identifier="org.eclipse.papyrus.umldi.Node_StateDefinitionShape" name="Node State Definition Shape" hint="Node_StateDefinitionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRicoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ExpansionRegionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ExpansionRegionOutputShape" name="Output Pin Expansion Region Output Shape" hint="OutputPin_ExpansionRegionOutputShape">
-    <iconEntry xmi:id="_sJ48gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_StateInvariantTransitionShape" identifier="org.eclipse.papyrus.umldi.Node_StateInvariantTransitionShape" name="Node State Invariant Transition Shape" hint="Node_StateInvariantTransitionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRk44Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape" name="Output Pin Loop Node Body Output Shape" hint="OutputPin_LoopNodeBodyOutputShape">
-    <iconEntry xmi:id="_sGxXENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Node_TickShape" identifier="org.eclipse.papyrus.umldi.Node_TickShape" name="Node Tick Shape" hint="Node_TickShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRq_gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Node.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_LoopNodeDeciderShape" identifier="org.eclipse.papyrus.umldi.OutputPin_LoopNodeDeciderShape" name="Output Pin Loop Node Decider Shape" hint="OutputPin_LoopNodeDeciderShape">
-    <iconEntry xmi:id="_sG0aYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ObjectFlow_Edge" identifier="org.eclipse.papyrus.umldi.ObjectFlow_Edge" name="Object Flow Edge" hint="ObjectFlow_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWXSQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ObjectFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ObjectFlow"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_LoopNodeOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_LoopNodeOutputShape" name="Output Pin Loop Node Output Shape" hint="OutputPin_LoopNodeOutputShape">
-    <iconEntry xmi:id="_sG89QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OccurrenceSpecification_Shape" identifier="org.eclipse.papyrus.umldi.OccurrenceSpecification_Shape" name="Occurrence Specification Shape" hint="OccurrenceSpecification_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzcLYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_LoopNodeResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_LoopNodeResultShape" name="Output Pin Loop Node Result Shape" hint="OutputPin_LoopNodeResultShape">
-    <iconEntry xmi:id="_sG558Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OccurrenceSpecification_Shape_CN" identifier="org.eclipse.papyrus.umldi.OccurrenceSpecification_Shape_CN" name="Occurrence Specification Shape CN" hint="OccurrenceSpecification_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6DwwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OccurrenceSpecification.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OccurrenceSpecification"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_LoopNodeVariableShape" identifier="org.eclipse.papyrus.umldi.OutputPin_LoopNodeVariableShape" name="Output Pin Loop Node Variable Shape" hint="OutputPin_LoopNodeVariableShape">
-    <iconEntry xmi:id="_sG22oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueAction_Shape" identifier="org.eclipse.papyrus.umldi.OpaqueAction_Shape" name="Opaque Action Shape" hint="OpaqueAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzoYoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OpaqueAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape" name="Output Pin Opaque Action Output Shape" hint="OutputPin_OpaqueActionOutputShape">
-    <iconEntry xmi:id="_sPBUINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_ClassNestedClassifierLabel" name="Opaque Behavior Class Nested Classifier Label" hint="OpaqueBehavior_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.OpaqueBehavior_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdZuYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_RaiseExceptionActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_RaiseExceptionActionOutputShape" name="Output Pin Raise Exception Action Output Shape" hint="OutputPin_RaiseExceptionActionOutputShape">
-    <iconEntry xmi:id="_sQq58Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_ComponentNestedClassifierLabel" name="Opaque Behavior Component Nested Classifier Label" hint="OpaqueBehavior_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.OpaqueBehavior_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdcxsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionOutputShape" name="Output Pin Read Extent Action Output Shape" hint="OutputPin_ReadExtentActionOutputShape">
-    <iconEntry xmi:id="_sMjO8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_InterfaceNestedClassifierLabel" name="Opaque Behavior Interface Nested Classifier Label" hint="OpaqueBehavior_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.OpaqueBehavior_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdf1ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionResultShape" name="Output Pin Read Extent Action Result Shape" hint="OutputPin_ReadExtentActionResultShape">
-    <iconEntry xmi:id="_sMgysNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_NestedClassifierLabel" name="Opaque Behavior Nested Classifier Label" hint="OpaqueBehavior_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdWrENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.OutputPin_ReadIsClassifiedObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionOutputShape" name="Output Pin Read Is Classified Object Action Output Shape" hint="OutputPin_ReadIsClassifiedObjectActionOutputShape">
-    <iconEntry xmi:id="_sKfZcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_OwnedBehaviorLabel" name="Opaque Behavior Owned Behavior Label" hint="OpaqueBehavior_OwnedBehaviorLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sjpgUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.OutputPin_ReadIsClassifiedObjectActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionResultShape" name="Output Pin Read Is Classified Object Action Result Shape" hint="OutputPin_ReadIsClassifiedObjectActionResultShape">
-    <iconEntry xmi:id="_sKcWINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_Shape" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_Shape" name="Opaque Behavior Shape" hint="OpaqueBehavior_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4pbgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.OutputPin_ReadLinkActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionOutputShape" name="Output Pin Read Link Action Output Shape" hint="OutputPin_ReadLinkActionOutputShape">
-    <iconEntry xmi:id="_sFEt8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueBehavior_Shape_CN" identifier="org.eclipse.papyrus.umldi.OpaqueBehavior_Shape_CN" name="Opaque Behavior Shape CN" hint="OpaqueBehavior_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8VBoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueBehavior.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.OutputPin_ReadLinkActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionResultShape" name="Output Pin Read Link Action Result Shape" hint="OutputPin_ReadLinkActionResultShape">
-    <iconEntry xmi:id="_sFBqoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OpaqueExpression_Shape" identifier="org.eclipse.papyrus.umldi.OpaqueExpression_Shape" name="Opaque Expression Shape" hint="OpaqueExpression_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAz5ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OpaqueExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.OutputPin_ReadLinkObjectEndActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndActionOutputShape" name="Output Pin Read Link Object End Action Output Shape" hint="OutputPin_ReadLinkObjectEndActionOutputShape">
-    <iconEntry xmi:id="_sL-AINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OperationTemplateParameter_TemplateParameterLabel" identifier="org.eclipse.papyrus.umldi.OperationTemplateParameter_TemplateParameterLabel" name="Operation Template Parameter Template Parameter Label" hint="OperationTemplateParameter_TemplateParameterLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sh3XoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OperationTemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OperationTemplateParameter"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndActionResultShape" name="Output Pin Read Link Object End Action Result Shape" hint="OutputPin_ReadLinkObjectEndActionResultShape">
-    <iconEntry xmi:id="_sL680Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_ClassOperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_ClassOperationLabel" name="Operation Class Operation Label" hint="Operation_ClassOperationLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Operation_OperationLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_saBDMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndQualifierActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndQualifierActionOutputShape" name="Output Pin Read Link Object End Qualifier Action Output Shape" hint="OutputPin_ReadLinkObjectEndQualifierActionOutputShape">
-    <iconEntry xmi:id="_sD8FgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_ComponentOperationLabel" name="Operation Component Operation Label" hint="Operation_ComponentOperationLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Operation_OperationLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_saGiwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndQualifierActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndQualifierActionResultShape" name="Output Pin Read Link Object End Qualifier Action Result Shape" hint="OutputPin_ReadLinkObjectEndQualifierActionResultShape">
-    <iconEntry xmi:id="_sD5CMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_DataTypeOperationLabel" name="Operation Data Type Operation Label" hint="Operation_DataTypeOperationLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Operation_OperationLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZ9_4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionOutputShape" name="Output Pin Read Self Action Output Shape" hint="OutputPin_ReadSelfActionOutputShape">
-    <iconEntry xmi:id="_sKHmANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_InterfaceOperationLabel" name="Operation Interface Operation Label" hint="Operation_InterfaceOperationLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Operation_OperationLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_saJmENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape" name="Output Pin Read Self Action Result Shape" hint="OutputPin_ReadSelfActionResultShape">
-    <iconEntry xmi:id="_sKEisNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_OperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_OperationLabel" name="Operation Operation Label" hint="Operation_OperationLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZ7joNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Operation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionOutputShape" name="Output Pin Read Structural Feature Action Output Shape" hint="OutputPin_ReadStructuralFeatureActionOutputShape">
-    <iconEntry xmi:id="_sOKYgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel" identifier="org.eclipse.papyrus.umldi.Operation_PrimitiveTypeOperationLabel" name="Operation Primitive Type Operation Label" hint="Operation_PrimitiveTypeOperationLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Operation_OperationLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_saEGgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionResultShape" name="Output Pin Read Structural Feature Action Result Shape" hint="OutputPin_ReadStructuralFeatureActionResultShape">
-    <iconEntry xmi:id="_sOH8QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionOutputShape" name="Output Pin Accept Call Action Output Shape" hint="OutputPin_AcceptCallActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKxtUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionOutputShape" name="Output Pin Read Variable Action Output Shape" hint="OutputPin_ReadVariableActionOutputShape">
-    <iconEntry xmi:id="_sP420Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionResultShape" name="Output Pin Accept Call Action Result Shape" hint="OutputPin_AcceptCallActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKuqANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionResultShape" name="Output Pin Read Variable Action Result Shape" hint="OutputPin_ReadVariableActionResultShape">
-    <iconEntry xmi:id="_sP1zgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionReturnShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AcceptCallActionReturnShape" name="Output Pin Accept Call Action Return Shape" hint="OutputPin_AcceptCallActionReturnShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKrmsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReclassifyObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReclassifyObjectActionOutputShape" name="Output Pin Reclassify Object Action Output Shape" hint="OutputPin_ReclassifyObjectActionOutputShape">
-    <iconEntry xmi:id="_sIE-oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionOutputShape" name="Output Pin Accept Event Action Output Shape" hint="OutputPin_AcceptEventActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sI6FENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReduceActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReduceActionOutputShape" name="Output Pin Reduce Action Output Shape" hint="OutputPin_ReduceActionOutputShape">
-    <iconEntry xmi:id="_sF8QoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape" name="Output Pin Accept Event Action Result Shape" hint="OutputPin_AcceptEventActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sI3BwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReduceActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReduceActionResultShape" name="Output Pin Reduce Action Result Shape" hint="OutputPin_ReduceActionResultShape">
-    <iconEntry xmi:id="_sF5NUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionOutputShape" name="Output Pin Add Structural Feature Value Action Output Shape" hint="OutputPin_AddStructuralFeatureValueActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNLhENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_RemoveStructuralFeatureValueActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_RemoveStructuralFeatureValueActionOutputShape" name="Output Pin Remove Structural Feature Value Action Output Shape" hint="OutputPin_RemoveStructuralFeatureValueActionOutputShape">
-    <iconEntry xmi:id="_sHxcoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape" name="Output Pin Add Structural Feature Value Action Result Shape" hint="OutputPin_AddStructuralFeatureValueActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNIdwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_RemoveStructuralFeatureValueActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_RemoveStructuralFeatureValueActionResultShape" name="Output Pin Remove Structural Feature Value Action Result Shape" hint="OutputPin_RemoveStructuralFeatureValueActionResultShape">
-    <iconEntry xmi:id="_sHuZUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_AddVariableValueActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_AddVariableValueActionOutputShape" name="Output Pin Add Variable Value Action Output Shape" hint="OutputPin_AddVariableValueActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPqNUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_RemoveVariableValueActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_RemoveVariableValueActionOutputShape" name="Output Pin Remove Variable Value Action Output Shape" hint="OutputPin_RemoveVariableValueActionOutputShape">
-    <iconEntry xmi:id="_sFkdMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_BroadcastSignalActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_BroadcastSignalActionOutputShape" name="Output Pin Broadcast Signal Action Output Shape" hint="OutputPin_BroadcastSignalActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLmMsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReplyActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReplyActionOutputShape" name="Output Pin Reply Action Output Shape" hint="OutputPin_ReplyActionOutputShape">
-    <iconEntry xmi:id="_sNzzMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionOutputShape" name="Output Pin Call Behavior Action Output Shape" hint="OutputPin_CallBehaviorActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIcLANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_SendObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_SendObjectActionOutputShape" name="Output Pin Send Object Action Output Shape" hint="OutputPin_SendObjectActionOutputShape">
-    <iconEntry xmi:id="_sEYKYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape" name="Output Pin Call Behavior Action Result Shape" hint="OutputPin_CallBehaviorActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIZuwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_SendSignalActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_SendSignalActionOutputShape" name="Output Pin Send Signal Action Output Shape" hint="OutputPin_SendSignalActionOutputShape">
-    <iconEntry xmi:id="_sE1dYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CallOperationActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CallOperationActionOutputShape" name="Output Pin Call Operation Action Output Shape" hint="OutputPin_CallOperationActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJtWUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_SequenceNodeOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_SequenceNodeOutputShape" name="Output Pin Sequence Node Output Shape" hint="OutputPin_SequenceNodeOutputShape">
-    <iconEntry xmi:id="_sGcm8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape" name="Output Pin Call Operation Action Result Shape" hint="OutputPin_CallOperationActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJqTANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_Shape" identifier="org.eclipse.papyrus.umldi.OutputPin_Shape" name="Output Pin Shape" hint="OutputPin_Shape">
-    <iconEntry xmi:id="_r0y2QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ClearAssociationActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ClearAssociationActionOutputShape" name="Output Pin Clear Association Action Output Shape" hint="OutputPin_ClearAssociationActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGQZsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_StartClassifierBehaviorActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_StartClassifierBehaviorActionOutputShape" name="Output Pin Start Classifier Behavior Action Output Shape" hint="OutputPin_StartClassifierBehaviorActionOutputShape">
-    <iconEntry xmi:id="_sJNnENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionOutputShape" name="Output Pin Clear Structural Feature Action Output Shape" hint="OutputPin_ClearStructuralFeatureActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOhk4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionOutputShape" name="Output Pin Start Object Behavior Action Output Shape" hint="OutputPin_StartObjectBehaviorActionOutputShape">
-    <iconEntry xmi:id="_sLRckNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionResultShape" name="Output Pin Clear Structural Feature Action Result Shape" hint="OutputPin_ClearStructuralFeatureActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOehkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionResultShape" name="Output Pin Start Object Behavior Action Result Shape" hint="OutputPin_StartObjectBehaviorActionResultShape">
-    <iconEntry xmi:id="_sLOZQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ClearVariableActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ClearVariableActionOutputShape" name="Output Pin Clear Variable Action Output Shape" hint="OutputPin_ClearVariableActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPM6UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_StructuredActivityNodeOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_StructuredActivityNodeOutputShape" name="Output Pin Structured Activity Node Output Shape" hint="OutputPin_StructuredActivityNodeOutputShape">
-    <iconEntry xmi:id="_sDkSENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ConditionalNodeOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ConditionalNodeOutputShape" name="Output Pin Conditional Node Output Shape" hint="OutputPin_ConditionalNodeOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIrbkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionOutputShape" name="Output Pin Test Identity Action Output Shape" hint="OutputPin_TestIdentityActionOutputShape">
-    <iconEntry xmi:id="_sDW2sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ConditionalNodeResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ConditionalNodeResultShape" name="Output Pin Conditional Node Result Shape" hint="OutputPin_ConditionalNodeResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIoYQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionResultShape" name="Output Pin Test Identity Action Result Shape" hint="OutputPin_TestIdentityActionResultShape">
-    <iconEntry xmi:id="_sDTzYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CreateLinkActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CreateLinkActionOutputShape" name="Output Pin Create Link Action Output Shape" hint="OutputPin_CreateLinkActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHJKgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_UnmarshallActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_UnmarshallActionOutputShape" name="Output Pin Unmarshall Action Output Shape" hint="OutputPin_UnmarshallActionOutputShape">
-    <iconEntry xmi:id="_sMUlcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionOutputShape" name="Output Pin Create Link Object Action Output Shape" hint="OutputPin_CreateLinkObjectActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQ6KgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_UnmarshallActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_UnmarshallActionResultShape" name="Output Pin Unmarshall Action Result Shape" hint="OutputPin_UnmarshallActionResultShape">
-    <iconEntry xmi:id="_sMSJMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionResultShape" name="Output Pin Create Link Object Action Result Shape" hint="OutputPin_CreateLinkObjectActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQ3HMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionOutputShape" name="Output Pin Value Specification Action Output Shape" hint="OutputPin_ValueSpecificationActionOutputShape">
-    <iconEntry xmi:id="_sQHgUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionOutputShape" name="Output Pin Create Object Action Output Shape" hint="OutputPin_CreateObjectActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQWJ0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape" name="Output Pin Value Specification Action Result Shape" hint="OutputPin_ValueSpecificationActionResultShape">
-    <iconEntry xmi:id="_sQEdANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionResultShape" name="Output Pin Create Object Action Result Shape" hint="OutputPin_CreateObjectActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQTtkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PackageImport_Edge" identifier="org.eclipse.papyrus.umldi.PackageImport_Edge" name="Package Import Edge" hint="PackageImport_Edge">
-    <iconEntry xmi:id="_sViy4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PackageImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageImport"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_DestroyLinkActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_DestroyLinkActionOutputShape" name="Output Pin Destroy Link Action Output Shape" hint="OutputPin_DestroyLinkActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNXHQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PackageMerge_Edge" identifier="org.eclipse.papyrus.umldi.PackageMerge_Edge" name="Package Merge Edge" hint="PackageMerge_Edge">
-    <iconEntry xmi:id="_sWMTINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PackageMerge.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageMerge"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_DestroyObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_DestroyObjectActionOutputShape" name="Output Pin Destroy Object Action Output Shape" hint="OutputPin_DestroyObjectActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sO1t8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_ActivityDiagram" identifier="org.eclipse.papyrus.umldi.Package_ActivityDiagram" name="Package Activity Diagram" hint="PapyrusUMLActivityDiagram">
-    <iconEntry xmi:id="_rsJQkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ExpansionRegionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ExpansionRegionOutputShape" name="Output Pin Expansion Region Output Shape" hint="OutputPin_ExpansionRegionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJ48gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_ClassDiagram" identifier="org.eclipse.papyrus.umldi.Package_ClassDiagram" name="Package Class Diagram" hint="PapyrusUMLClassDiagram">
-    <iconEntry xmi:id="_rguqwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape" name="Output Pin Loop Node Body Output Shape" hint="OutputPin_LoopNodeBodyOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGxXENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_CommunicationDiagram" identifier="org.eclipse.papyrus.umldi.Package_CommunicationDiagram" name="Package Communication Diagram" hint="PapyrusUMLCommunicationDiagram">
-    <iconEntry xmi:id="_rsZvQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_LoopNodeDeciderShape" identifier="org.eclipse.papyrus.umldi.OutputPin_LoopNodeDeciderShape" name="Output Pin Loop Node Decider Shape" hint="OutputPin_LoopNodeDeciderShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sG0aYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_ComponentDiagram" identifier="org.eclipse.papyrus.umldi.Package_ComponentDiagram" name="Package Component Diagram" hint="PapyrusUMLComponentDiagram">
-    <iconEntry xmi:id="_riiooNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_LoopNodeOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_LoopNodeOutputShape" name="Output Pin Loop Node Output Shape" hint="OutputPin_LoopNodeOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sG89QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_CompositeStructureDiagram" identifier="org.eclipse.papyrus.umldi.Package_CompositeStructureDiagram" name="Package Composite Structure Diagram" hint="CompositeStructure">
-    <iconEntry xmi:id="_rr9qYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_LoopNodeResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_LoopNodeResultShape" name="Output Pin Loop Node Result Shape" hint="OutputPin_LoopNodeResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sG558Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_DeploymentDiagram" identifier="org.eclipse.papyrus.umldi.Package_DeploymentDiagram" name="Package Deployment Diagram" hint="PapyrusUMLDeploymentDiagram">
-    <iconEntry xmi:id="_riMDUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_LoopNodeVariableShape" identifier="org.eclipse.papyrus.umldi.OutputPin_LoopNodeVariableShape" name="Output Pin Loop Node Variable Shape" hint="OutputPin_LoopNodeVariableShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sG22oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin_As_UML::LoopNode::loopNodeVariable"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_InteractionOverviewDiagram" identifier="org.eclipse.papyrus.umldi.Package_InteractionOverviewDiagram" name="Package Interaction Overview Diagram" hint="PapyrusUMLInteractionOverviewDiagram">
-    <iconEntry xmi:id="_rsOwINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape" name="Output Pin Opaque Action Output Shape" hint="OutputPin_OpaqueActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPBUINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_ProfileDiagram" identifier="org.eclipse.papyrus.umldi.Package_ProfileDiagram" name="Package Profile Diagram" hint="PapyrusUMLProfileDiagram">
-    <iconEntry xmi:id="_rhHFQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_RaiseExceptionActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_RaiseExceptionActionOutputShape" name="Output Pin Raise Exception Action Output Shape" hint="OutputPin_RaiseExceptionActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQq58Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_SequenceDiagram" identifier="org.eclipse.papyrus.umldi.Package_SequenceDiagram" name="Package Sequence Diagram" hint="PapyrusUMLSequenceDiagram">
-    <iconEntry xmi:id="_rsUPsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionOutputShape" name="Output Pin Read Extent Action Output Shape" hint="OutputPin_ReadExtentActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMjO8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_Shape" identifier="org.eclipse.papyrus.umldi.Package_Shape" name="Package Shape" hint="Package_Shape">
-    <iconEntry xmi:id="_r2PAsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionResultShape" name="Output Pin Read Extent Action Result Shape" hint="OutputPin_ReadExtentActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMgysNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_Shape_CN" identifier="org.eclipse.papyrus.umldi.Package_Shape_CN" name="Package Shape CN" hint="Package_Shape_CN">
-    <iconEntry xmi:id="_r5-RMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionOutputShape" name="Output Pin Read Is Classified Object Action Output Shape" hint="OutputPin_ReadIsClassifiedObjectActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKfZcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_StateMachineDiagram" identifier="org.eclipse.papyrus.umldi.Package_StateMachineDiagram" name="Package State Machine Diagram" hint="PapyrusUMLStateMachineDiagram">
-    <iconEntry xmi:id="_rsDxANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionResultShape" name="Output Pin Read Is Classified Object Action Result Shape" hint="OutputPin_ReadIsClassifiedObjectActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKcWINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_TimingDiagram" identifier="org.eclipse.papyrus.umldi.Package_TimingDiagram" name="Package Timing Diagram" hint="PapyrusUMLTimingDiagram">
-    <iconEntry xmi:id="_rsfO0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionOutputShape" name="Output Pin Read Link Action Output Shape" hint="OutputPin_ReadLinkActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFEt8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_UseCaseDiagram" identifier="org.eclipse.papyrus.umldi.Package_UseCaseDiagram" name="Package Use Case Diagram" hint="UseCase">
-    <iconEntry xmi:id="_ri3_0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionResultShape" name="Output Pin Read Link Action Result Shape" hint="OutputPin_ReadLinkActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFBqoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Parameter_ParameterLabel" identifier="org.eclipse.papyrus.umldi.Parameter_ParameterLabel" name="Parameter Parameter Label" hint="Parameter_ParameterLabel">
-    <iconEntry xmi:id="_sgb0QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Parameter"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndActionOutputShape" name="Output Pin Read Link Object End Action Output Shape" hint="OutputPin_ReadLinkObjectEndActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sL-AINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Parameter_Shape" identifier="org.eclipse.papyrus.umldi.Parameter_Shape" name="Parameter Shape" hint="Parameter_Shape">
-    <iconEntry xmi:id="_r_viANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Parameter"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndActionResultShape" name="Output Pin Read Link Object End Action Result Shape" hint="OutputPin_ReadLinkObjectEndActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sL680Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PartDecomposition_Shape" identifier="org.eclipse.papyrus.umldi.PartDecomposition_Shape" name="Part Decomposition Shape" hint="PartDecomposition_Shape">
-    <iconEntry xmi:id="_r3wqsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PartDecomposition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PartDecomposition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndQualifierActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndQualifierActionOutputShape" name="Output Pin Read Link Object End Qualifier Action Output Shape" hint="OutputPin_ReadLinkObjectEndQualifierActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sD8FgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PartDecomposition_Shape_CN" identifier="org.eclipse.papyrus.umldi.PartDecomposition_Shape_CN" name="Part Decomposition Shape CN" hint="PartDecomposition_Shape_CN">
-    <iconEntry xmi:id="_r7c34Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PartDecomposition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PartDecomposition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndQualifierActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadLinkObjectEndQualifierActionResultShape" name="Output Pin Read Link Object End Qualifier Action Result Shape" hint="OutputPin_ReadLinkObjectEndQualifierActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sD5CMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Path_Edge" identifier="org.eclipse.papyrus.umldi.Path_Edge" name="Path Edge" hint="Path_Edge">
-    <iconEntry xmi:id="_sYmG4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Path.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionOutputShape" name="Output Pin Read Self Action Output Shape" hint="OutputPin_ReadSelfActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKHmANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_AttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_AttributeLabel" name="Port Attribute Label" hint="Port_AttributeLabel">
-    <iconEntry xmi:id="_sZI5cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape" name="Output Pin Read Self Action Result Shape" hint="OutputPin_ReadSelfActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKEisNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_BehaviorEdge" identifier="org.eclipse.papyrus.umldi.Port_BehaviorEdge" name="Port Behavior Edge" hint="Port_BehaviorEdge">
-    <iconEntry xmi:id="_sX8moNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionOutputShape" name="Output Pin Read Structural Feature Action Output Shape" hint="OutputPin_ReadStructuralFeatureActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOKYgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_BehaviorShape" identifier="org.eclipse.papyrus.umldi.Port_BehaviorShape" name="Port Behavior Shape" hint="Port_BehaviorShape">
-    <iconEntry xmi:id="_r_qpgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionResultShape" name="Output Pin Read Structural Feature Action Result Shape" hint="OutputPin_ReadStructuralFeatureActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOH8QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_ClassAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_ClassAttributeLabel" name="Port Class Attribute Label" hint="Port_ClassAttributeLabel">
-    <iconEntry xmi:id="_sZQ1QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionOutputShape" name="Output Pin Read Variable Action Output Shape" hint="OutputPin_ReadVariableActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sP420Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_ComponentAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_ComponentAttributeLabel" name="Port Component Attribute Label" hint="Port_ComponentAttributeLabel">
-    <iconEntry xmi:id="_sZWU0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionResultShape" name="Output Pin Read Variable Action Result Shape" hint="OutputPin_ReadVariableActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sP1zgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_DataTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_DataTypeAttributeLabel" name="Port Data Type Attribute Label" hint="Port_DataTypeAttributeLabel">
-    <iconEntry xmi:id="_sZOZANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReclassifyObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReclassifyObjectActionOutputShape" name="Output Pin Reclassify Object Action Output Shape" hint="OutputPin_ReclassifyObjectActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIE-oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_Edge" identifier="org.eclipse.papyrus.umldi.Port_Edge" name="Port Edge" hint="Port_Edge">
-    <iconEntry xmi:id="_sWRysNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReduceActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReduceActionOutputShape" name="Output Pin Reduce Action Output Shape" hint="OutputPin_ReduceActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sF8QoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_InterfaceAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_InterfaceAttributeLabel" name="Port Interface Attribute Label" hint="Port_InterfaceAttributeLabel">
-    <iconEntry xmi:id="_sZZYINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReduceActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReduceActionResultShape" name="Output Pin Reduce Action Result Shape" hint="OutputPin_ReduceActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sF5NUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_PrimitiveTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_PrimitiveTypeAttributeLabel" name="Port Primitive Type Attribute Label" hint="Port_PrimitiveTypeAttributeLabel">
-    <iconEntry xmi:id="_sZT4kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_RemoveStructuralFeatureValueActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_RemoveStructuralFeatureValueActionOutputShape" name="Output Pin Remove Structural Feature Value Action Output Shape" hint="OutputPin_RemoveStructuralFeatureValueActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHxcoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_Shape" identifier="org.eclipse.papyrus.umldi.Port_Shape" name="Port Shape" hint="Port_Shape">
-    <iconEntry xmi:id="_r1CG0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_RemoveStructuralFeatureValueActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_RemoveStructuralFeatureValueActionResultShape" name="Output Pin Remove Structural Feature Value Action Result Shape" hint="OutputPin_RemoveStructuralFeatureValueActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHuZUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_Shape_CN" identifier="org.eclipse.papyrus.umldi.Port_Shape_CN" name="Port Shape CN" hint="Port_Shape_CN">
-    <iconEntry xmi:id="_r76K4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_RemoveVariableValueActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_RemoveVariableValueActionOutputShape" name="Output Pin Remove Variable Value Action Output Shape" hint="OutputPin_RemoveVariableValueActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFkdMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_SignalAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_SignalAttributeLabel" name="Port Signal Attribute Label" hint="Port_SignalAttributeLabel">
-    <iconEntry xmi:id="_sZLVsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Port_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ReplyActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ReplyActionOutputShape" name="Output Pin Reply Action Output Shape" hint="OutputPin_ReplyActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNzzMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.PrimitiveType_ClassNestedClassifierLabel" name="Primitive Type Class Nested Classifier Label" hint="PrimitiveType_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_scK_UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_SendObjectActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_SendObjectActionOutputShape" name="Output Pin Send Object Action Output Shape" hint="OutputPin_SendObjectActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEYKYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.PrimitiveType_ComponentNestedClassifierLabel" name="Primitive Type Component Nested Classifier Label" hint="PrimitiveType_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_scOCoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_SendSignalActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_SendSignalActionOutputShape" name="Output Pin Send Signal Action Output Shape" hint="OutputPin_SendSignalActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sE1dYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.PrimitiveType_InterfaceNestedClassifierLabel" name="Primitive Type Interface Nested Classifier Label" hint="PrimitiveType_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_scQe4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.PrimitiveType_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_SequenceNodeOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_SequenceNodeOutputShape" name="Output Pin Sequence Node Output Shape" hint="OutputPin_SequenceNodeOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGcm8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.PrimitiveType_NestedClassifierLabel" name="Primitive Type Nested Classifier Label" hint="PrimitiveType_NestedClassifierLabel">
-    <iconEntry xmi:id="_scIjENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PrimitiveType"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_Shape" identifier="org.eclipse.papyrus.umldi.OutputPin_Shape" name="Output Pin Shape" hint="OutputPin_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0y2QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_Shape" identifier="org.eclipse.papyrus.umldi.PrimitiveType_Shape" name="Primitive Type Shape" hint="PrimitiveType_Shape">
-    <iconEntry xmi:id="_r2W8gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PrimitiveType"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_StartClassifierBehaviorActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_StartClassifierBehaviorActionOutputShape" name="Output Pin Start Classifier Behavior Action Output Shape" hint="OutputPin_StartClassifierBehaviorActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJNnENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN" identifier="org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN" name="Primitive Type Shape CN" hint="PrimitiveType_Shape_CN">
-    <iconEntry xmi:id="_r6LskNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PrimitiveType"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionOutputShape" name="Output Pin Start Object Behavior Action Output Shape" hint="OutputPin_StartObjectBehaviorActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLRckNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProfileApplication_Edge" identifier="org.eclipse.papyrus.umldi.ProfileApplication_Edge" name="Profile Application Edge" hint="ProfileApplication_Edge">
-    <iconEntry xmi:id="_sV4xINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProfileApplication.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProfileApplication"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionResultShape" name="Output Pin Start Object Behavior Action Result Shape" hint="OutputPin_StartObjectBehaviorActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLOZQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Profile_Shape" identifier="org.eclipse.papyrus.umldi.Profile_Shape" name="Profile Shape" hint="Profile_Shape">
-    <iconEntry xmi:id="_r2qegNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Profile.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Profile"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_StructuredActivityNodeOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_StructuredActivityNodeOutputShape" name="Output Pin Structured Activity Node Output Shape" hint="OutputPin_StructuredActivityNodeOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDkSENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Profile_Shape_CN" identifier="org.eclipse.papyrus.umldi.Profile_Shape_CN" name="Profile Shape CN" hint="Profile_Shape_CN">
-    <iconEntry xmi:id="_r6kuINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Profile.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Profile"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionOutputShape" name="Output Pin Test Identity Action Output Shape" hint="OutputPin_TestIdentityActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDW2sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_AttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_AttributeLabel" name="Property Attribute Label" hint="Property_AttributeLabel">
-    <iconEntry xmi:id="_sZcbcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionResultShape" name="Output Pin Test Identity Action Result Shape" hint="OutputPin_TestIdentityActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDTzYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_ClassAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_ClassAttributeLabel" name="Property Class Attribute Label" hint="Property_ClassAttributeLabel">
-    <iconEntry xmi:id="_sZkXQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_UnmarshallActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_UnmarshallActionOutputShape" name="Output Pin Unmarshall Action Output Shape" hint="OutputPin_UnmarshallActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMUlcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_ComponentAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_ComponentAttributeLabel" name="Property Component Attribute Label" hint="Property_ComponentAttributeLabel">
-    <iconEntry xmi:id="_sZp20Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_UnmarshallActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_UnmarshallActionResultShape" name="Output Pin Unmarshall Action Result Shape" hint="OutputPin_UnmarshallActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMSJMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel" name="Property Data Type Attribute Label" hint="Property_DataTypeAttributeLabel">
-    <iconEntry xmi:id="_sZh7ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionOutputShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionOutputShape" name="Output Pin Value Specification Action Output Shape" hint="OutputPin_ValueSpecificationActionOutputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQHgUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_Edge" identifier="org.eclipse.papyrus.umldi.Property_Edge" name="Property Edge" hint="Property_Edge">
-    <iconEntry xmi:id="_sWt3kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape" identifier="org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape" name="Output Pin Value Specification Action Result Shape" hint="OutputPin_ValueSpecificationActionResultShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQEdANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/OutputPin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.OutputPin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel" name="Property Interface Attribute Label" hint="Property_InterfaceAttributeLabel">
-    <iconEntry xmi:id="_sZsTENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PackageImport_Edge" identifier="org.eclipse.papyrus.umldi.PackageImport_Edge" name="Package Import Edge" hint="PackageImport_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sViy4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PackageImport.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.Property_PrimitiveTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_PrimitiveTypeAttributeLabel" name="Property Primitive Type Attribute Label" hint="Property_PrimitiveTypeAttributeLabel">
-    <iconEntry xmi:id="_sZmzgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PackageMerge_Edge" identifier="org.eclipse.papyrus.umldi.PackageMerge_Edge" name="Package Merge Edge" hint="PackageMerge_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWMTINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PackageMerge.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PackageMerge"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_Shape" identifier="org.eclipse.papyrus.umldi.Property_Shape" name="Property Shape" hint="Property_Shape">
-    <iconEntry xmi:id="_rz0l4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_ActivityDiagram" identifier="org.eclipse.papyrus.umldi.Package_ActivityDiagram" name="Package Activity Diagram" hint="PapyrusUMLActivityDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rsJQkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_Shape_CN" identifier="org.eclipse.papyrus.umldi.Property_Shape_CN" name="Property Shape CN" hint="Property_Shape_CN">
-    <iconEntry xmi:id="_r6qNsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_ClassDiagram" identifier="org.eclipse.papyrus.umldi.Package_ClassDiagram" name="Package Class Diagram" hint="PapyrusUMLClassDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rguqwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_SignalAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_SignalAttributeLabel" name="Property Signal Attribute Label" hint="Property_SignalAttributeLabel">
-    <iconEntry xmi:id="_sZe3sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Property_AttributeLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_CommunicationDiagram" identifier="org.eclipse.papyrus.umldi.Package_CommunicationDiagram" name="Package Communication Diagram" hint="PapyrusUMLCommunicationDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rsZvQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_ClassNestedClassifierLabel" name="Protocol State Machine Class Nested Classifier Label" hint="ProtocolStateMachine_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sbebwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProtocolStateMachine_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_ComponentDiagram" identifier="org.eclipse.papyrus.umldi.Package_ComponentDiagram" name="Package Component Diagram" hint="PapyrusUMLComponentDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_riiooNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_ComponentNestedClassifierLabel" name="Protocol State Machine Component Nested Classifier Label" hint="ProtocolStateMachine_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sbhfENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProtocolStateMachine_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_CompositeStructureDiagram" identifier="org.eclipse.papyrus.umldi.Package_CompositeStructureDiagram" name="Package Composite Structure Diagram" hint="CompositeStructure" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rr9qYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_InterfaceNestedClassifierLabel" name="Protocol State Machine Interface Nested Classifier Label" hint="ProtocolStateMachine_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sbkiYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ProtocolStateMachine_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_DeploymentDiagram" identifier="org.eclipse.papyrus.umldi.Package_DeploymentDiagram" name="Package Deployment Diagram" hint="PapyrusUMLDeploymentDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_riMDUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_NestedClassifierLabel" name="Protocol State Machine Nested Classifier Label" hint="ProtocolStateMachine_NestedClassifierLabel">
-    <iconEntry xmi:id="_sbbYcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolStateMachine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_InteractionOverviewDiagram" identifier="org.eclipse.papyrus.umldi.Package_InteractionOverviewDiagram" name="Package Interaction Overview Diagram" hint="PapyrusUMLInteractionOverviewDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rsOwINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_OwnedBehaviorLabel" name="Protocol State Machine Owned Behavior Label" hint="ProtocolStateMachine_OwnedBehaviorLabel">
-    <iconEntry xmi:id="_sjmdANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolStateMachine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_ProfileDiagram" identifier="org.eclipse.papyrus.umldi.Package_ProfileDiagram" name="Package Profile Diagram" hint="PapyrusUMLProfileDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rhHFQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape" name="Protocol State Machine Shape" hint="ProtocolStateMachine_Shape">
-    <iconEntry xmi:id="_r1jrQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolStateMachine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_SequenceDiagram" identifier="org.eclipse.papyrus.umldi.Package_SequenceDiagram" name="Package Sequence Diagram" hint="PapyrusUMLSequenceDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rsUPsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape_CN" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape_CN" name="Protocol State Machine Shape CN" hint="ProtocolStateMachine_Shape_CN">
-    <iconEntry xmi:id="_r5NcMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolStateMachine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_Shape" identifier="org.eclipse.papyrus.umldi.Package_Shape" name="Package Shape" hint="Package_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2PAsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolTransition_Edge" identifier="org.eclipse.papyrus.umldi.ProtocolTransition_Edge" name="Protocol Transition Edge" hint="ProtocolTransition_Edge">
-    <iconEntry xmi:id="_sV-QsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolTransition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolTransition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_Shape_CN" identifier="org.eclipse.papyrus.umldi.Package_Shape_CN" name="Package Shape CN" hint="Package_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5-RMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolTransition_InternalTransitionLabel" identifier="org.eclipse.papyrus.umldi.ProtocolTransition_InternalTransitionLabel" name="Protocol Transition Internal Transition Label" hint="ProtocolTransition_InternalTransitionLabel">
-    <iconEntry xmi:id="_sf9TINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolTransition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolTransition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_StateMachineDiagram" identifier="org.eclipse.papyrus.umldi.Package_StateMachineDiagram" name="Package State Machine Diagram" hint="PapyrusUMLStateMachineDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rsDxANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_ChoiceShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_ChoiceShape" name="Pseudostate Choice Shape" hint="Pseudostate_ChoiceShape">
-    <iconEntry xmi:id="_sBzXgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_Shape"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_TimingDiagram" identifier="org.eclipse.papyrus.umldi.Package_TimingDiagram" name="Package Timing Diagram" hint="PapyrusUMLTimingDiagram" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rsfO0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_DeepHistoryShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_DeepHistoryShape" name="Pseudostate Deep History Shape" hint="Pseudostate_DeepHistoryShape">
-    <iconEntry xmi:id="_sBZH0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_Shape"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Package_UseCaseDiagram" identifier="org.eclipse.papyrus.umldi.Package_UseCaseDiagram" name="Package Use Case Diagram" hint="UseCase" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ri3_0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Package"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_EntryPointShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_EntryPointShape" name="Pseudostate Entry Point Shape" hint="Pseudostate_EntryPointShape">
-    <iconEntry xmi:id="_sB43ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_Shape"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Parameter_ParameterLabel" identifier="org.eclipse.papyrus.umldi.Parameter_ParameterLabel" name="Parameter Parameter Label" hint="Parameter_ParameterLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sgb0QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Parameter"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_ExitPointShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_ExitPointShape" name="Pseudostate Exit Point Shape" hint="Pseudostate_ExitPointShape">
-    <iconEntry xmi:id="_sB9vkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_Shape"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Parameter_Shape" identifier="org.eclipse.papyrus.umldi.Parameter_Shape" name="Parameter Shape" hint="Parameter_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r_viANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Parameter"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_ForkShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_ForkShape" name="Pseudostate Fork Shape" hint="Pseudostate_ForkShape">
-    <iconEntry xmi:id="_sBoYYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_Shape"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PartDecomposition_Shape" identifier="org.eclipse.papyrus.umldi.PartDecomposition_Shape" name="Part Decomposition Shape" hint="PartDecomposition_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3wqsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PartDecomposition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PartDecomposition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_InitialShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_InitialShape" name="Pseudostate Initial Shape" hint="Pseudostate_InitialShape">
-    <iconEntry xmi:id="_sBToQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_Shape"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PartDecomposition_Shape_CN" identifier="org.eclipse.papyrus.umldi.PartDecomposition_Shape_CN" name="Part Decomposition Shape CN" hint="PartDecomposition_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7c34Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PartDecomposition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PartDecomposition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_JoinShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_JoinShape" name="Pseudostate Join Shape" hint="Pseudostate_JoinShape">
-    <iconEntry xmi:id="_sBjf4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_Shape"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Path_Edge" identifier="org.eclipse.papyrus.umldi.Path_Edge" name="Path Edge" hint="Path_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYmG4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Path.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_JunctionShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_JunctionShape" name="Pseudostate Junction Shape" hint="Pseudostate_JunctionShape">
-    <iconEntry xmi:id="_sBt38Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_Shape"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_AttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_AttributeLabel" name="Port Attribute Label" hint="Port_AttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZI5cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_ShallowHistoryShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_ShallowHistoryShape" name="Pseudostate Shallow History Shape" hint="Pseudostate_ShallowHistoryShape">
-    <iconEntry xmi:id="_sBenYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_Shape"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_BehaviorEdge" identifier="org.eclipse.papyrus.umldi.Port_BehaviorEdge" name="Port Behavior Edge" hint="Port_BehaviorEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sX8moNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_Shape" identifier="org.eclipse.papyrus.umldi.Pseudostate_Shape" name="Pseudostate Shape" hint="Pseudostate_Shape">
-    <iconEntry xmi:id="_r4WgkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <editHelperAdviceConfiguration xsi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_vie3QOuQEeWDDMpLFpMEMA" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.PseudostateKindInitializerAdvice"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Pseudostate"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_BehaviorShape" identifier="org.eclipse.papyrus.umldi.Port_BehaviorShape" name="Port Behavior Shape" hint="Port_BehaviorShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r_qpgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_Shape_CN" identifier="org.eclipse.papyrus.umldi.Pseudostate_Shape_CN" name="Pseudostate Shape CN" hint="Pseudostate_Shape_CN">
-    <iconEntry xmi:id="_r8FKANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Pseudostate"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_ClassAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_ClassAttributeLabel" name="Port Class Attribute Label" hint="Port_ClassAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Port_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZQ1QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_TerminateShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_TerminateShape" name="Pseudostate Terminate Shape" hint="Pseudostate_TerminateShape">
-    <iconEntry xmi:id="_sCDPINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_Shape"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_ComponentAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_ComponentAttributeLabel" name="Port Component Attribute Label" hint="Port_ComponentAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Port_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZWU0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.RaiseExceptionAction_Shape" identifier="org.eclipse.papyrus.umldi.RaiseExceptionAction_Shape" name="Raise Exception Action Shape" hint="RaiseExceptionAction_Shape">
-    <iconEntry xmi:id="_rz6sgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/RaiseExceptionAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.RaiseExceptionAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_DataTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_DataTypeAttributeLabel" name="Port Data Type Attribute Label" hint="Port_DataTypeAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Port_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZOZANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadExtentAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadExtentAction_Shape" name="Read Extent Action Shape" hint="ReadExtentAction_Shape">
-    <iconEntry xmi:id="_r05j8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadExtentAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadExtentAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_Edge" identifier="org.eclipse.papyrus.umldi.Port_Edge" name="Port Edge" hint="Port_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWRysNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadIsClassifiedObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadIsClassifiedObjectAction_Shape" name="Read Is Classified Object Action Shape" hint="ReadIsClassifiedObjectAction_Shape">
-    <iconEntry xmi:id="_r4DloNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_InterfaceAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_InterfaceAttributeLabel" name="Port Interface Attribute Label" hint="Port_InterfaceAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Port_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZZYINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadLinkAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadLinkAction_Shape" name="Read Link Action Shape" hint="ReadLinkAction_Shape">
-    <iconEntry xmi:id="_ryvAwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadLinkAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_PrimitiveTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_PrimitiveTypeAttributeLabel" name="Port Primitive Type Attribute Label" hint="Port_PrimitiveTypeAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Port_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZT4kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadLinkObjectEndAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadLinkObjectEndAction_Shape" name="Read Link Object End Action Shape" hint="ReadLinkObjectEndAction_Shape">
-    <iconEntry xmi:id="_r2Gd0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadLinkObjectEndAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadLinkObjectEndAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_Shape" identifier="org.eclipse.papyrus.umldi.Port_Shape" name="Port Shape" hint="Port_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1CG0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadLinkObjectEndQualifierAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadLinkObjectEndQualifierAction_Shape" name="Read Link Object End Qualifier Action Shape" hint="ReadLinkObjectEndQualifierAction_Shape">
-    <iconEntry xmi:id="_r3gMANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadLinkObjectEndQualifierAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_Shape_CN" identifier="org.eclipse.papyrus.umldi.Port_Shape_CN" name="Port Shape CN" hint="Port_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r76K4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Port"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadSelfAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadSelfAction_Shape" name="Read Self Action Shape" hint="ReadSelfAction_Shape">
-    <iconEntry xmi:id="_r17esNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadSelfAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadSelfAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Port_SignalAttributeLabel" identifier="org.eclipse.papyrus.umldi.Port_SignalAttributeLabel" name="Port Signal Attribute Label" hint="Port_SignalAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Port_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZLVsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadStructuralFeatureAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadStructuralFeatureAction_Shape" name="Read Structural Feature Action Shape" hint="ReadStructuralFeatureAction_Shape">
-    <iconEntry xmi:id="_r4RBANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadStructuralFeatureAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.PrimitiveType_ClassNestedClassifierLabel" name="Primitive Type Class Nested Classifier Label" hint="PrimitiveType_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.PrimitiveType_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scK_UNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadVariableAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadVariableAction_Shape" name="Read Variable Action Shape" hint="ReadVariableAction_Shape">
-    <iconEntry xmi:id="_rz3pMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadVariableAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.PrimitiveType_ComponentNestedClassifierLabel" name="Primitive Type Component Nested Classifier Label" hint="PrimitiveType_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.PrimitiveType_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scOCoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Realization_Edge" identifier="org.eclipse.papyrus.umldi.Realization_Edge" name="Realization Edge" hint="Realization_Edge">
-    <iconEntry xmi:id="_sWf1INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Realization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Realization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.PrimitiveType_InterfaceNestedClassifierLabel" name="Primitive Type Interface Nested Classifier Label" hint="PrimitiveType_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.PrimitiveType_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scQe4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Realization_Shape" identifier="org.eclipse.papyrus.umldi.Realization_Shape" name="Realization Shape" hint="Realization_Shape">
-    <iconEntry xmi:id="_r2k-8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Realization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Realization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.PrimitiveType_NestedClassifierLabel" name="Primitive Type Nested Classifier Label" hint="PrimitiveType_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_scIjENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PrimitiveType"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Realization_Shape_CN" identifier="org.eclipse.papyrus.umldi.Realization_Shape_CN" name="Realization Shape CN" hint="Realization_Shape_CN">
-    <iconEntry xmi:id="_r6aWENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Realization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Realization"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_Shape" identifier="org.eclipse.papyrus.umldi.PrimitiveType_Shape" name="Primitive Type Shape" hint="PrimitiveType_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2W8gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PrimitiveType"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel" identifier="org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel" name="Reception Interface Reception Label" hint="Reception_InterfaceReceptionLabel">
-    <iconEntry xmi:id="_se1RwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Reception.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Reception_ReceptionLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN" identifier="org.eclipse.papyrus.umldi.PrimitiveType_Shape_CN" name="Primitive Type Shape CN" hint="PrimitiveType_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6LskNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/PrimitiveType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.PrimitiveType"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Reception_ReceptionLabel" identifier="org.eclipse.papyrus.umldi.Reception_ReceptionLabel" name="Reception Reception Label" hint="Reception_ReceptionLabel">
-    <iconEntry xmi:id="_seyOcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Reception.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Reception"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProfileApplication_Edge" identifier="org.eclipse.papyrus.umldi.ProfileApplication_Edge" name="Profile Application Edge" hint="ProfileApplication_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sV4xINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProfileApplication.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProfileApplication"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReclassifyObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.ReclassifyObjectAction_Shape" name="Reclassify Object Action Shape" hint="ReclassifyObjectAction_Shape">
-    <iconEntry xmi:id="_r3zuANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReclassifyObjectAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Profile_Shape" identifier="org.eclipse.papyrus.umldi.Profile_Shape" name="Profile Shape" hint="Profile_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2qegNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Profile.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Profile"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape" identifier="org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape" name="Redefinable Template Signature Shape" hint="RedefinableTemplateSignature_Shape">
-    <iconEntry xmi:id="_r0U8MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.RedefinableTemplateSignature"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Profile_Shape_CN" identifier="org.eclipse.papyrus.umldi.Profile_Shape_CN" name="Profile Shape CN" hint="Profile_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6kuINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Profile.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Profile"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape_CN" identifier="org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape_CN" name="Redefinable Template Signature Shape CN" hint="RedefinableTemplateSignature_Shape_CN">
-    <iconEntry xmi:id="_r7aboNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.RedefinableTemplateSignature"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_AttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_AttributeLabel" name="Property Attribute Label" hint="Property_AttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZcbcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReduceAction_Shape" identifier="org.eclipse.papyrus.umldi.ReduceAction_Shape" name="Reduce Action Shape" hint="ReduceAction_Shape">
-    <iconEntry xmi:id="_r1uDUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReduceAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReduceAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_ClassAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_ClassAttributeLabel" name="Property Class Attribute Label" hint="Property_ClassAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Property_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZkXQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Region_Shape" identifier="org.eclipse.papyrus.umldi.Region_Shape" name="Region Shape" hint="Region_Shape">
-    <iconEntry xmi:id="_r2h7oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Region.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Region"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_ComponentAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_ComponentAttributeLabel" name="Property Component Attribute Label" hint="Property_ComponentAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Property_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZp20Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Region_Shape_CN" identifier="org.eclipse.papyrus.umldi.Region_Shape_CN" name="Region Shape CN" hint="Region_Shape_CN">
-    <iconEntry xmi:id="_r6U2gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Region.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Region"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_DataTypeAttributeLabel" name="Property Data Type Attribute Label" hint="Property_DataTypeAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Property_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZh7ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.RemoveStructuralFeatureValueAction_Shape" identifier="org.eclipse.papyrus.umldi.RemoveStructuralFeatureValueAction_Shape" name="Remove Structural Feature Value Action Shape" hint="RemoveStructuralFeatureValueAction_Shape">
-    <iconEntry xmi:id="_r0eGINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/RemoveStructuralFeatureValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_Edge" identifier="org.eclipse.papyrus.umldi.Property_Edge" name="Property Edge" hint="Property_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWt3kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.RemoveVariableValueAction_Shape" identifier="org.eclipse.papyrus.umldi.RemoveVariableValueAction_Shape" name="Remove Variable Value Action Shape" hint="RemoveVariableValueAction_Shape">
-    <iconEntry xmi:id="_ryyEENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/RemoveVariableValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.RemoveVariableValueAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_InterfaceAttributeLabel" name="Property Interface Attribute Label" hint="Property_InterfaceAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Property_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZsTENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReplyAction_Shape" identifier="org.eclipse.papyrus.umldi.ReplyAction_Shape" name="Reply Action Shape" hint="ReplyAction_Shape">
-    <iconEntry xmi:id="_r4LhcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReplyAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReplyAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_PrimitiveTypeAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_PrimitiveTypeAttributeLabel" name="Property Primitive Type Attribute Label" hint="Property_PrimitiveTypeAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Property_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZmzgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Representation_Edge" identifier="org.eclipse.papyrus.umldi.Representation_Edge" name="Representation Edge" hint="Representation_Edge">
-    <iconEntry xmi:id="_sYkRsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Representation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:ExternallyRegisteredType" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_Shape" identifier="org.eclipse.papyrus.umldi.Property_Shape" name="Property Shape" hint="Property_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rz0l4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.SendObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.SendObjectAction_Shape" name="Send Object Action Shape" hint="SendObjectAction_Shape">
-    <iconEntry xmi:id="_ryskgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/SendObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.SendObjectAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_Shape_CN" identifier="org.eclipse.papyrus.umldi.Property_Shape_CN" name="Property Shape CN" hint="Property_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6qNsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Property"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.SendSignalAction_Shape" identifier="org.eclipse.papyrus.umldi.SendSignalAction_Shape" name="Send Signal Action Shape" hint="SendSignalAction_Shape">
-    <iconEntry xmi:id="_r3jPUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/SendSignalAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.SendSignalAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Property_SignalAttributeLabel" identifier="org.eclipse.papyrus.umldi.Property_SignalAttributeLabel" name="Property Signal Attribute Label" hint="Property_SignalAttributeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Property_AttributeLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sZe3sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.SequenceNode_Shape" identifier="org.eclipse.papyrus.umldi.SequenceNode_Shape" name="Sequence Node Shape" hint="SequenceNode_Shape">
-    <iconEntry xmi:id="_r3lrkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/SequenceNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.SequenceNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_ClassNestedClassifierLabel" name="Protocol State Machine Class Nested Classifier Label" hint="ProtocolStateMachine_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ProtocolStateMachine_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbebwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.SignalEvent_Shape" identifier="org.eclipse.papyrus.umldi.SignalEvent_Shape" name="Signal Event Shape" hint="SignalEvent_Shape">
-    <iconEntry xmi:id="_sABO0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/SignalEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.SignalEvent"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_ComponentNestedClassifierLabel" name="Protocol State Machine Component Nested Classifier Label" hint="ProtocolStateMachine_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ProtocolStateMachine_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbhfENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Signal_ClassNestedClassifierLabel" name="Signal Class Nested Classifier Label" hint="Signal_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_seSfMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_InterfaceNestedClassifierLabel" name="Protocol State Machine Interface Nested Classifier Label" hint="ProtocolStateMachine_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.ProtocolStateMachine_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbkiYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Signal_ComponentNestedClassifierLabel" name="Signal Component Nested Classifier Label" hint="Signal_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_seU7cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_NestedClassifierLabel" name="Protocol State Machine Nested Classifier Label" hint="ProtocolStateMachine_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbbYcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolStateMachine"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Signal_InterfaceNestedClassifierLabel" name="Signal Interface Nested Classifier Label" hint="Signal_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_seX-wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Signal_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_OwnedBehaviorLabel" name="Protocol State Machine Owned Behavior Label" hint="ProtocolStateMachine_OwnedBehaviorLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sjmdANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolStateMachine"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Signal_NestedClassifierLabel" name="Signal Nested Classifier Label" hint="Signal_NestedClassifierLabel">
-    <iconEntry xmi:id="_seQC8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Signal"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape" name="Protocol State Machine Shape" hint="ProtocolStateMachine_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1jrQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolStateMachine"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_Shape" identifier="org.eclipse.papyrus.umldi.Signal_Shape" name="Signal Shape" hint="Signal_Shape">
-    <iconEntry xmi:id="_r3QUYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Signal"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape_CN" identifier="org.eclipse.papyrus.umldi.ProtocolStateMachine_Shape_CN" name="Protocol State Machine Shape CN" hint="ProtocolStateMachine_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5NcMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolStateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolStateMachine"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_Shape_CN" identifier="org.eclipse.papyrus.umldi.Signal_Shape_CN" name="Signal Shape CN" hint="Signal_Shape_CN">
-    <iconEntry xmi:id="_r68hkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Signal"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolTransition_Edge" identifier="org.eclipse.papyrus.umldi.ProtocolTransition_Edge" name="Protocol Transition Edge" hint="ProtocolTransition_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sV-QsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolTransition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolTransition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Slot_SlotLabel" identifier="org.eclipse.papyrus.umldi.Slot_SlotLabel" name="Slot Slot Label" hint="Slot_SlotLabel">
-    <iconEntry xmi:id="_shhZYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Slot.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Slot"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ProtocolTransition_InternalTransitionLabel" identifier="org.eclipse.papyrus.umldi.ProtocolTransition_InternalTransitionLabel" name="Protocol Transition Internal Transition Label" hint="ProtocolTransition_InternalTransitionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sf9TINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ProtocolTransition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ProtocolTransition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StartClassifierBehaviorAction_Shape" identifier="org.eclipse.papyrus.umldi.StartClassifierBehaviorAction_Shape" name="Start Classifier Behavior Action Shape" hint="StartClassifierBehaviorAction_Shape">
-    <iconEntry xmi:id="_r35NkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StartClassifierBehaviorAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_ChoiceShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_ChoiceShape" name="Pseudostate Choice Shape" hint="Pseudostate_ChoiceShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Pseudostate_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sBzXgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StartObjectBehaviorAction_Shape" identifier="org.eclipse.papyrus.umldi.StartObjectBehaviorAction_Shape" name="Start Object Behavior Action Shape" hint="StartObjectBehaviorAction_Shape">
-    <iconEntry xmi:id="_rzOI8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StartObjectBehaviorAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_DeepHistoryShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_DeepHistoryShape" name="Pseudostate Deep History Shape" hint="Pseudostate_DeepHistoryShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Pseudostate_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sBZH0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateInvariant_CompactShape" identifier="org.eclipse.papyrus.umldi.StateInvariant_CompactShape" name="State Invariant Compact Shape" hint="StateInvariant_CompactShape">
-    <iconEntry xmi:id="_sRgncNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateInvariant.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateInvariant"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_EntryPointShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_EntryPointShape" name="Pseudostate Entry Point Shape" hint="Pseudostate_EntryPointShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Pseudostate_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sB43ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateInvariant_FullShape" identifier="org.eclipse.papyrus.umldi.StateInvariant_FullShape" name="State Invariant Full Shape" hint="StateInvariant_FullShape">
-    <iconEntry xmi:id="_sRbu8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateInvariant.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateInvariant"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_ExitPointShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_ExitPointShape" name="Pseudostate Exit Point Shape" hint="Pseudostate_ExitPointShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Pseudostate_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sB9vkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateInvariant_Shape" identifier="org.eclipse.papyrus.umldi.StateInvariant_Shape" name="State Invariant Shape" hint="StateInvariant_Shape">
-    <iconEntry xmi:id="_r1rAANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateInvariant.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateInvariant"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_ForkShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_ForkShape" name="Pseudostate Fork Shape" hint="Pseudostate_ForkShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Pseudostate_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sBoYYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateInvariant_Shape_CN" identifier="org.eclipse.papyrus.umldi.StateInvariant_Shape_CN" name="State Invariant Shape CN" hint="StateInvariant_Shape_CN">
-    <iconEntry xmi:id="_r5S7wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateInvariant.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateInvariant"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_InitialShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_InitialShape" name="Pseudostate Initial Shape" hint="Pseudostate_InitialShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Pseudostate_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sBToQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.StateMachine_ClassNestedClassifierLabel" name="State Machine Class Nested Classifier Label" hint="StateMachine_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sdDJENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateMachine_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_JoinShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_JoinShape" name="Pseudostate Join Shape" hint="Pseudostate_JoinShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Pseudostate_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sBjf4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.StateMachine_ComponentNestedClassifierLabel" name="State Machine Component Nested Classifier Label" hint="StateMachine_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sdFlUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateMachine_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_JunctionShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_JunctionShape" name="Pseudostate Junction Shape" hint="Pseudostate_JunctionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Pseudostate_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sBt38Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.StateMachine_InterfaceNestedClassifierLabel" name="State Machine Interface Nested Classifier Label" hint="StateMachine_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sdIooNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateMachine_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_ShallowHistoryShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_ShallowHistoryShape" name="Pseudostate Shallow History Shape" hint="Pseudostate_ShallowHistoryShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Pseudostate_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sBenYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.StateMachine_NestedClassifierLabel" name="State Machine Nested Classifier Label" hint="StateMachine_NestedClassifierLabel">
-    <iconEntry xmi:id="_sdAFwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateMachine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_Shape" identifier="org.eclipse.papyrus.umldi.Pseudostate_Shape" name="Pseudostate Shape" hint="Pseudostate_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4WgkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <editHelperAdviceConfiguration xmi:type="elementtypesconfigurations:EditHelperAdviceConfiguration" xmi:id="_vie3QOuQEeWDDMpLFpMEMA" editHelperAdviceClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.advice.PseudostateKindInitializerAdvice"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Pseudostate"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.StateMachine_OwnedBehaviorLabel" name="State Machine Owned Behavior Label" hint="StateMachine_OwnedBehaviorLabel">
-    <iconEntry xmi:id="_sjjZsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateMachine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_Shape_CN" identifier="org.eclipse.papyrus.umldi.Pseudostate_Shape_CN" name="Pseudostate Shape CN" hint="Pseudostate_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8FKANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Pseudostate"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_Shape" identifier="org.eclipse.papyrus.umldi.StateMachine_Shape" name="State Machine Shape" hint="StateMachine_Shape">
-    <iconEntry xmi:id="_r32KQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateMachine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Pseudostate_TerminateShape" identifier="org.eclipse.papyrus.umldi.Pseudostate_TerminateShape" name="Pseudostate Terminate Shape" hint="Pseudostate_TerminateShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Pseudostate_Shape">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sCDPINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Pseudostate.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_Shape_CN" identifier="org.eclipse.papyrus.umldi.StateMachine_Shape_CN" name="State Machine Shape CN" hint="StateMachine_Shape_CN">
-    <iconEntry xmi:id="_r7f7MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateMachine"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.RaiseExceptionAction_Shape" identifier="org.eclipse.papyrus.umldi.RaiseExceptionAction_Shape" name="Raise Exception Action Shape" hint="RaiseExceptionAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rz6sgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/RaiseExceptionAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.RaiseExceptionAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.State_Shape" identifier="org.eclipse.papyrus.umldi.State_Shape" name="State Shape" hint="State_Shape">
-    <iconEntry xmi:id="_r3ascNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/State.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.State"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadExtentAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadExtentAction_Shape" name="Read Extent Action Shape" hint="ReadExtentAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r05j8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadExtentAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadExtentAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.State_Shape_CN" identifier="org.eclipse.papyrus.umldi.State_Shape_CN" name="State Shape CN" hint="State_Shape_CN">
-    <iconEntry xmi:id="_r7KkANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/State.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.State"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadIsClassifiedObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadIsClassifiedObjectAction_Shape" name="Read Is Classified Object Action Shape" hint="ReadIsClassifiedObjectAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4DloNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadIsClassifiedObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadIsClassifiedObjectAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Stereotype_ClassNestedClassifierLabel" name="Stereotype Class Nested Classifier Label" hint="Stereotype_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sbqB8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Stereotype_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadLinkAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadLinkAction_Shape" name="Read Link Action Shape" hint="ReadLinkAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ryvAwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadLinkAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadLinkAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Stereotype_ComponentNestedClassifierLabel" name="Stereotype Component Nested Classifier Label" hint="Stereotype_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sbseMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Stereotype_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadLinkObjectEndAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadLinkObjectEndAction_Shape" name="Read Link Object End Action Shape" hint="ReadLinkObjectEndAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2Gd0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadLinkObjectEndAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadLinkObjectEndAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Stereotype_InterfaceNestedClassifierLabel" name="Stereotype Interface Nested Classifier Label" hint="Stereotype_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sbvhgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Stereotype_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadLinkObjectEndQualifierAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadLinkObjectEndQualifierAction_Shape" name="Read Link Object End Qualifier Action Shape" hint="ReadLinkObjectEndQualifierAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3gMANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadLinkObjectEndQualifierAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadLinkObjectEndQualifierAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Stereotype_NestedClassifierLabel" name="Stereotype Nested Classifier Label" hint="Stereotype_NestedClassifierLabel">
-    <iconEntry xmi:id="_sbm-oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Stereotype"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadSelfAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadSelfAction_Shape" name="Read Self Action Shape" hint="ReadSelfAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r17esNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadSelfAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadSelfAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_Shape" identifier="org.eclipse.papyrus.umldi.Stereotype_Shape" name="Stereotype Shape" hint="Stereotype_Shape">
-    <iconEntry xmi:id="_ry0gUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Stereotype"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadStructuralFeatureAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadStructuralFeatureAction_Shape" name="Read Structural Feature Action Shape" hint="ReadStructuralFeatureAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4RBANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadStructuralFeatureAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadStructuralFeatureAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_Shape_CN" identifier="org.eclipse.papyrus.umldi.Stereotype_Shape_CN" name="Stereotype Shape CN" hint="Stereotype_Shape_CN">
-    <iconEntry xmi:id="_r5V_ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Stereotype"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReadVariableAction_Shape" identifier="org.eclipse.papyrus.umldi.ReadVariableAction_Shape" name="Read Variable Action Shape" hint="ReadVariableAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rz3pMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReadVariableAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReadVariableAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_StereotypeLabel" identifier="org.eclipse.papyrus.umldi.Stereotype_StereotypeLabel" name="Stereotype Stereotype Label" hint="Stereotype_StereotypeLabel">
-    <iconEntry xmi:id="_siKSkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Stereotype"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Realization_Edge" identifier="org.eclipse.papyrus.umldi.Realization_Edge" name="Realization Edge" hint="Realization_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWf1INx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Realization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Realization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge" identifier="org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge" name="Stereotype Property Reference Edge" hint="StereotypePropertyReferenceEdge">
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="uml.elementtypesconfigurations#org.eclipse.papyrus.StereotypePropertyReference"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Realization_Shape" identifier="org.eclipse.papyrus.umldi.Realization_Shape" name="Realization Shape" hint="Realization_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2k-8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Realization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Realization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StringExpression_PackagedElementShape" identifier="org.eclipse.papyrus.umldi.StringExpression_PackagedElementShape" name="String Expression Packaged Element Shape" hint="StringExpression_PackagedElementShape">
-    <iconEntry xmi:id="_sBLscNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StringExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Realization_Shape_CN" identifier="org.eclipse.papyrus.umldi.Realization_Shape_CN" name="Realization Shape CN" hint="Realization_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6aWENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Realization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Realization"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StringExpression_Shape" identifier="org.eclipse.papyrus.umldi.StringExpression_Shape" name="String Expression Shape" hint="StringExpression_Shape">
-    <iconEntry xmi:id="_sAgXANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StringExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StringExpression"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel" identifier="org.eclipse.papyrus.umldi.Reception_InterfaceReceptionLabel" name="Reception Interface Reception Label" hint="Reception_InterfaceReceptionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Reception_ReceptionLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_se1RwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Reception.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.umldi.StructuredActivityNode_Shape" name="Structured Activity Node Shape" hint="StructuredActivityNode_Shape">
-    <iconEntry xmi:id="_r0JWANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StructuredActivityNode"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Reception_ReceptionLabel" identifier="org.eclipse.papyrus.umldi.Reception_ReceptionLabel" name="Reception Reception Label" hint="Reception_ReceptionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seyOcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Reception.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Reception"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Substitution_Edge" identifier="org.eclipse.papyrus.umldi.Substitution_Edge" name="Substitution Edge" hint="Substitution_Edge">
-    <iconEntry xmi:id="_sVzRkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Substitution"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReclassifyObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.ReclassifyObjectAction_Shape" name="Reclassify Object Action Shape" hint="ReclassifyObjectAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3zuANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReclassifyObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReclassifyObjectAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Substitution_Shape" identifier="org.eclipse.papyrus.umldi.Substitution_Shape" name="Substitution Shape" hint="Substitution_Shape">
-    <iconEntry xmi:id="_r0R44Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Substitution"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape" identifier="org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape" name="Redefinable Template Signature Shape" hint="RedefinableTemplateSignature_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0U8MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.RedefinableTemplateSignature"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Substitution_Shape_CN" identifier="org.eclipse.papyrus.umldi.Substitution_Shape_CN" name="Substitution Shape CN" hint="Substitution_Shape_CN">
-    <iconEntry xmi:id="_r7Sf0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Substitution"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape_CN" identifier="org.eclipse.papyrus.umldi.RedefinableTemplateSignature_Shape_CN" name="Redefinable Template Signature Shape CN" hint="RedefinableTemplateSignature_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7aboNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/RedefinableTemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.RedefinableTemplateSignature"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TemplateBinding_Edge" identifier="org.eclipse.papyrus.umldi.TemplateBinding_Edge" name="Template Binding Edge" hint="TemplateBinding_Edge">
-    <iconEntry xmi:id="_sWPWcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TemplateBinding.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TemplateBinding"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReduceAction_Shape" identifier="org.eclipse.papyrus.umldi.ReduceAction_Shape" name="Reduce Action Shape" hint="ReduceAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1uDUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReduceAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReduceAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TemplateParameter_TemplateParameterLabel" identifier="org.eclipse.papyrus.umldi.TemplateParameter_TemplateParameterLabel" name="Template Parameter Template Parameter Label" hint="TemplateParameter_TemplateParameterLabel">
-    <iconEntry xmi:id="_sh6a8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TemplateParameter"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Region_Shape" identifier="org.eclipse.papyrus.umldi.Region_Shape" name="Region Shape" hint="Region_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2h7oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Region.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Region"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TemplateSignature_Shape" identifier="org.eclipse.papyrus.umldi.TemplateSignature_Shape" name="Template Signature Shape" hint="TemplateSignature_Shape">
-    <iconEntry xmi:id="_ry5_4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TemplateSignature"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Region_Shape_CN" identifier="org.eclipse.papyrus.umldi.Region_Shape_CN" name="Region Shape CN" hint="Region_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6U2gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Region.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Region"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TemplateSignature_Shape_CN" identifier="org.eclipse.papyrus.umldi.TemplateSignature_Shape_CN" name="Template Signature Shape CN" hint="TemplateSignature_Shape_CN">
-    <iconEntry xmi:id="_r5beoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TemplateSignature"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.RemoveStructuralFeatureValueAction_Shape" identifier="org.eclipse.papyrus.umldi.RemoveStructuralFeatureValueAction_Shape" name="Remove Structural Feature Value Action Shape" hint="RemoveStructuralFeatureValueAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0eGINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/RemoveStructuralFeatureValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.RemoveStructuralFeatureValueAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TestIdentityAction_Shape" identifier="org.eclipse.papyrus.umldi.TestIdentityAction_Shape" name="Test Identity Action Shape" hint="TestIdentityAction_Shape">
-    <iconEntry xmi:id="_r0GSsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TestIdentityAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TestIdentityAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.RemoveVariableValueAction_Shape" identifier="org.eclipse.papyrus.umldi.RemoveVariableValueAction_Shape" name="Remove Variable Value Action Shape" hint="RemoveVariableValueAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ryyEENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/RemoveVariableValueAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.RemoveVariableValueAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_LocalPostconditionShape" identifier="org.eclipse.papyrus.umldi.TimeConstraint_LocalPostconditionShape" name="Time Constraint Local Postcondition Shape" hint="TimeConstraint_LocalPostconditionShape">
-    <iconEntry xmi:id="_r9zBQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ReplyAction_Shape" identifier="org.eclipse.papyrus.umldi.ReplyAction_Shape" name="Reply Action Shape" hint="ReplyAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r4LhcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ReplyAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ReplyAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_LocalPreconditionShape" identifier="org.eclipse.papyrus.umldi.TimeConstraint_LocalPreconditionShape" name="Time Constraint Local Precondition Shape" hint="TimeConstraint_LocalPreconditionShape">
-    <iconEntry xmi:id="_r-HxYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Representation_Edge" identifier="org.eclipse.papyrus.umldi.Representation_Edge" name="Representation Edge" hint="Representation_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.gmf.runtime.emf.type.core.null">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sYkRsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Representation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_PostconditionLabel" identifier="org.eclipse.papyrus.umldi.TimeConstraint_PostconditionLabel" name="Time Constraint Postcondition Label" hint="TimeConstraint_PostconditionLabel">
-    <iconEntry xmi:id="_sg2D8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.SendObjectAction_Shape" identifier="org.eclipse.papyrus.umldi.SendObjectAction_Shape" name="Send Object Action Shape" hint="SendObjectAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ryskgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/SendObjectAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.TimeConstraint_PreconditionLabel" identifier="org.eclipse.papyrus.umldi.TimeConstraint_PreconditionLabel" name="Time Constraint Precondition Label" hint="TimeConstraint_PreconditionLabel">
-    <iconEntry xmi:id="_shRhwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.SendSignalAction_Shape" identifier="org.eclipse.papyrus.umldi.SendSignalAction_Shape" name="Send Signal Action Shape" hint="SendSignalAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3jPUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/SendSignalAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.SendSignalAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_Shape" identifier="org.eclipse.papyrus.umldi.TimeConstraint_Shape" name="Time Constraint Shape" hint="TimeConstraint_Shape">
-    <iconEntry xmi:id="_r1NF8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.SequenceNode_Shape" identifier="org.eclipse.papyrus.umldi.SequenceNode_Shape" name="Sequence Node Shape" hint="SequenceNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3lrkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/SequenceNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.SequenceNode"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_Shape_CN" identifier="org.eclipse.papyrus.umldi.TimeConstraint_Shape_CN" name="Time Constraint Shape CN" hint="TimeConstraint_Shape_CN">
-    <iconEntry xmi:id="_r8KpkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.SignalEvent_Shape" identifier="org.eclipse.papyrus.umldi.SignalEvent_Shape" name="Signal Event Shape" hint="SignalEvent_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sABO0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/SignalEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.SignalEvent"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeEvent_Shape" identifier="org.eclipse.papyrus.umldi.TimeEvent_Shape" name="Time Event Shape" hint="TimeEvent_Shape">
-    <iconEntry xmi:id="_sAGuYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeEvent"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Signal_ClassNestedClassifierLabel" name="Signal Class Nested Classifier Label" hint="Signal_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Signal_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seSfMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeExpression_Shape" identifier="org.eclipse.papyrus.umldi.TimeExpression_Shape" name="Time Expression Shape" hint="TimeExpression_Shape">
-    <iconEntry xmi:id="_r3-GENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeExpression"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Signal_ComponentNestedClassifierLabel" name="Signal Component Nested Classifier Label" hint="Signal_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Signal_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seU7cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeExpression_Shape_CN" identifier="org.eclipse.papyrus.umldi.TimeExpression_Shape_CN" name="Time Expression Shape CN" hint="TimeExpression_Shape_CN">
-    <iconEntry xmi:id="_r7n3ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeExpression"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Signal_InterfaceNestedClassifierLabel" name="Signal Interface Nested Classifier Label" hint="Signal_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Signal_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seX-wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeInterval_Shape" identifier="org.eclipse.papyrus.umldi.TimeInterval_Shape" name="Time Interval Shape" hint="TimeInterval_Shape">
-    <iconEntry xmi:id="_sAw1sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeInterval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeInterval"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Signal_NestedClassifierLabel" name="Signal Nested Classifier Label" hint="Signal_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_seQC8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Signal"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeObservation_EventEdge" identifier="org.eclipse.papyrus.umldi.TimeObservation_EventEdge" name="Time Observation Event Edge" hint="TimeObservation_EventEdge">
-    <iconEntry xmi:id="_sXVioNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeObservation.Event"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_Shape" identifier="org.eclipse.papyrus.umldi.Signal_Shape" name="Signal Shape" hint="Signal_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3QUYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Signal"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeObservation_Shape" identifier="org.eclipse.papyrus.umldi.TimeObservation_Shape" name="Time Observation Shape" hint="TimeObservation_Shape">
-    <iconEntry xmi:id="_r3SwoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeObservation"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Signal_Shape_CN" identifier="org.eclipse.papyrus.umldi.Signal_Shape_CN" name="Signal Shape CN" hint="Signal_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r68hkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Signal.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Signal"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeObservation_Shape_CN" identifier="org.eclipse.papyrus.umldi.TimeObservation_Shape_CN" name="Time Observation Shape CN" hint="TimeObservation_Shape_CN">
-    <iconEntry xmi:id="_r6_k4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeObservation"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Slot_SlotLabel" identifier="org.eclipse.papyrus.umldi.Slot_SlotLabel" name="Slot Slot Label" hint="Slot_SlotLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_shhZYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Slot.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Slot"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Transition_Edge" identifier="org.eclipse.papyrus.umldi.Transition_Edge" name="Transition Edge" hint="Transition_Edge">
-    <iconEntry xmi:id="_sVfvkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Transition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Transition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StartClassifierBehaviorAction_Shape" identifier="org.eclipse.papyrus.umldi.StartClassifierBehaviorAction_Shape" name="Start Classifier Behavior Action Shape" hint="StartClassifierBehaviorAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r35NkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StartClassifierBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StartClassifierBehaviorAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Transition_InternalTransitionLabel" identifier="org.eclipse.papyrus.umldi.Transition_InternalTransitionLabel" name="Transition Internal Transition Label" hint="Transition_InternalTransitionLabel">
-    <iconEntry xmi:id="_sf624Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Transition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Transition"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StartObjectBehaviorAction_Shape" identifier="org.eclipse.papyrus.umldi.StartObjectBehaviorAction_Shape" name="Start Object Behavior Action Shape" hint="StartObjectBehaviorAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzOI8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StartObjectBehaviorAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StartObjectBehaviorAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Trigger_DeferrableTriggerLabel" identifier="org.eclipse.papyrus.umldi.Trigger_DeferrableTriggerLabel" name="Trigger Deferrable Trigger Label" hint="Trigger_DeferrableTriggerLabel">
-    <iconEntry xmi:id="_sfD7QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Trigger.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Trigger"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateInvariant_CompactShape" identifier="org.eclipse.papyrus.umldi.StateInvariant_CompactShape" name="State Invariant Compact Shape" hint="StateInvariant_CompactShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRgncNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateInvariant.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateInvariant"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UnmarshallAction_Shape" identifier="org.eclipse.papyrus.umldi.UnmarshallAction_Shape" name="Unmarshall Action Shape" hint="UnmarshallAction_Shape">
-    <iconEntry xmi:id="_r2JhINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UnmarshallAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UnmarshallAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateInvariant_FullShape" identifier="org.eclipse.papyrus.umldi.StateInvariant_FullShape" name="State Invariant Full Shape" hint="StateInvariant_FullShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sRbu8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateInvariant.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateInvariant"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Usage_Edge" identifier="org.eclipse.papyrus.umldi.Usage_Edge" name="Usage Edge" hint="Usage_Edge">
-    <iconEntry xmi:id="_sVdTUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Usage"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateInvariant_Shape" identifier="org.eclipse.papyrus.umldi.StateInvariant_Shape" name="State Invariant Shape" hint="StateInvariant_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1rAANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateInvariant.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateInvariant"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Usage_Shape" identifier="org.eclipse.papyrus.umldi.Usage_Shape" name="Usage Shape" hint="Usage_Shape">
-    <iconEntry xmi:id="_r0LyQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Usage"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateInvariant_Shape_CN" identifier="org.eclipse.papyrus.umldi.StateInvariant_Shape_CN" name="State Invariant Shape CN" hint="StateInvariant_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5S7wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateInvariant.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateInvariant"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Usage_Shape_CN" identifier="org.eclipse.papyrus.umldi.Usage_Shape_CN" name="Usage Shape CN" hint="Usage_Shape_CN">
-    <iconEntry xmi:id="_r7HgsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Usage"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.StateMachine_ClassNestedClassifierLabel" name="State Machine Class Nested Classifier Label" hint="StateMachine_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.StateMachine_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdDJENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.UseCase_ClassNestedClassifierLabel" name="Use Case Class Nested Classifier Label" hint="UseCase_ClassNestedClassifierLabel">
-    <iconEntry xmi:id="_sc3i4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.StateMachine_ComponentNestedClassifierLabel" name="State Machine Component Nested Classifier Label" hint="StateMachine_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.StateMachine_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdFlUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_ClassifierShape" identifier="org.eclipse.papyrus.umldi.UseCase_ClassifierShape" name="Use Case Classifier Shape" hint="UseCase_ClassifierShape">
-    <iconEntry xmi:id="_r80w4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.StateMachine_InterfaceNestedClassifierLabel" name="State Machine Interface Nested Classifier Label" hint="StateMachine_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.StateMachine_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdIooNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.UseCase_ComponentNestedClassifierLabel" name="Use Case Component Nested Classifier Label" hint="UseCase_ComponentNestedClassifierLabel">
-    <iconEntry xmi:id="_sc6mMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.StateMachine_NestedClassifierLabel" name="State Machine Nested Classifier Label" hint="StateMachine_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sdAFwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateMachine"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.UseCase_InterfaceNestedClassifierLabel" name="Use Case Interface Nested Classifier Label" hint="UseCase_InterfaceNestedClassifierLabel">
-    <iconEntry xmi:id="_sc9pgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.UseCase_NestedClassifierLabel"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_OwnedBehaviorLabel" identifier="org.eclipse.papyrus.umldi.StateMachine_OwnedBehaviorLabel" name="State Machine Owned Behavior Label" hint="StateMachine_OwnedBehaviorLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sjjZsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateMachine"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.UseCase_NestedClassifierLabel" name="Use Case Nested Classifier Label" hint="UseCase_NestedClassifierLabel">
-    <iconEntry xmi:id="_sc1GoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_Shape" identifier="org.eclipse.papyrus.umldi.StateMachine_Shape" name="State Machine Shape" hint="StateMachine_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r32KQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateMachine"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_OwnedUseCaseLabel" identifier="org.eclipse.papyrus.umldi.UseCase_OwnedUseCaseLabel" name="Use Case Owned Use Case Label" hint="UseCase_OwnedUseCaseLabel">
-    <iconEntry xmi:id="_skB60Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StateMachine_Shape_CN" identifier="org.eclipse.papyrus.umldi.StateMachine_Shape_CN" name="State Machine Shape CN" hint="StateMachine_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7f7MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StateMachine.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StateMachine"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_Shape" identifier="org.eclipse.papyrus.umldi.UseCase_Shape" name="Use Case Shape" hint="UseCase_Shape">
-    <iconEntry xmi:id="_r2nbMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.State_Shape" identifier="org.eclipse.papyrus.umldi.State_Shape" name="State Shape" hint="State_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3ascNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/State.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.State"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_Shape_CCN" identifier="org.eclipse.papyrus.umldi.UseCase_Shape_CCN" name="Use Case Shape CCN" hint="UseCase_Shape_CCN">
-    <iconEntry xmi:id="_r-XpANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.State_Shape_CN" identifier="org.eclipse.papyrus.umldi.State_Shape_CN" name="State Shape CN" hint="State_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7KkANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/State.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.State"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_Shape_CN" identifier="org.eclipse.papyrus.umldi.UseCase_Shape_CN" name="Use Case Shape CN" hint="UseCase_Shape_CN">
-    <iconEntry xmi:id="_r6cyUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Stereotype_ClassNestedClassifierLabel" name="Stereotype Class Nested Classifier Label" hint="Stereotype_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Stereotype_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbqB8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_UseCaseLabel" identifier="org.eclipse.papyrus.umldi.UseCase_UseCaseLabel" name="Use Case Use Case Label" hint="UseCase_UseCaseLabel">
-    <iconEntry xmi:id="_skRLYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Stereotype_ComponentNestedClassifierLabel" name="Stereotype Component Nested Classifier Label" hint="Stereotype_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Stereotype_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbseMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AcceptCallActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AcceptCallActionInputShape" name="Value Pin Accept Call Action Input Shape" hint="ValuePin_AcceptCallActionInputShape">
-    <iconEntry xmi:id="_sKojYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Stereotype_InterfaceNestedClassifierLabel" name="Stereotype Interface Nested Classifier Label" hint="Stereotype_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.Stereotype_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbvhgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AcceptEventActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AcceptEventActionInputShape" name="Value Pin Accept Event Action Input Shape" hint="ValuePin_AcceptEventActionInputShape">
-    <iconEntry xmi:id="_sIz-cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.Stereotype_NestedClassifierLabel" name="Stereotype Nested Classifier Label" hint="Stereotype_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sbm-oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Stereotype"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionInputShape" name="Value Pin Add Structural Feature Value Action Input Shape" hint="ValuePin_AddStructuralFeatureValueActionInputShape">
-    <iconEntry xmi:id="_sNFacNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_Shape" identifier="org.eclipse.papyrus.umldi.Stereotype_Shape" name="Stereotype Shape" hint="Stereotype_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ry0gUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Stereotype"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionInsertAtShape" name="Value Pin Add Structural Feature Value Action Insert At Shape" hint="ValuePin_AddStructuralFeatureValueActionInsertAtShape">
-    <iconEntry xmi:id="_sMsY4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_Shape_CN" identifier="org.eclipse.papyrus.umldi.Stereotype_Shape_CN" name="Stereotype Shape CN" hint="Stereotype_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5V_ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Stereotype"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionObjectShape" name="Value Pin Add Structural Feature Value Action Object Shape" hint="ValuePin_AddStructuralFeatureValueActionObjectShape">
-    <iconEntry xmi:id="_sM83kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Stereotype_StereotypeLabel" identifier="org.eclipse.papyrus.umldi.Stereotype_StereotypeLabel" name="Stereotype Stereotype Label" hint="Stereotype_StereotypeLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_siKSkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Stereotype.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Stereotype"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionValueShape" name="Value Pin Add Structural Feature Value Action Value Shape" hint="ValuePin_AddStructuralFeatureValueActionValueShape">
-    <iconEntry xmi:id="_sM07wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge" identifier="org.eclipse.papyrus.umldi.StereotypePropertyReferenceEdge" name="Stereotype Property Reference Edge" hint="StereotypePropertyReferenceEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.StereotypePropertyReference"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionInputShape" name="Value Pin Add Variable Value Action Input Shape" hint="ValuePin_AddVariableValueActionInputShape">
-    <iconEntry xmi:id="_sPnxENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StringExpression_PackagedElementShape" identifier="org.eclipse.papyrus.umldi.StringExpression_PackagedElementShape" name="String Expression Packaged Element Shape" hint="StringExpression_PackagedElementShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sBLscNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StringExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.StringExpression_As_UML::Package::packagedElement"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionInsertAtShape" name="Value Pin Add Variable Value Action Insert At Shape" hint="ValuePin_AddVariableValueActionInsertAtShape">
-    <iconEntry xmi:id="_sPWEQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StringExpression_Shape" identifier="org.eclipse.papyrus.umldi.StringExpression_Shape" name="String Expression Shape" hint="StringExpression_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAgXANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StringExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.StringExpression"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionValueShape" name="Value Pin Add Variable Value Action Value Shape" hint="ValuePin_AddVariableValueActionValueShape">
-    <iconEntry xmi:id="_sPenINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.umldi.StructuredActivityNode_Shape" name="Structured Activity Node Shape" hint="StructuredActivityNode_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0JWANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/StructuredActivityNode.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi: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.umldi.ValuePin_BroadcastSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ValuePin_BroadcastSignalActionArgumentShape" name="Value Pin Broadcast Signal Action Argument Shape" hint="ValuePin_BroadcastSignalActionArgumentShape">
-    <iconEntry xmi:id="_sLZ_cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Substitution_Edge" identifier="org.eclipse.papyrus.umldi.Substitution_Edge" name="Substitution Edge" hint="Substitution_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sVzRkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Substitution"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_BroadcastSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_BroadcastSignalActionInputShape" name="Value Pin Broadcast Signal Action Input Shape" hint="ValuePin_BroadcastSignalActionInputShape">
-    <iconEntry xmi:id="_sLjJYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Substitution_Shape" identifier="org.eclipse.papyrus.umldi.Substitution_Shape" name="Substitution Shape" hint="Substitution_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0R44Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Substitution"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionArgumentShape" name="Value Pin Call Behavior Action Argument Shape" hint="ValuePin_CallBehaviorActionArgumentShape">
-    <iconEntry xmi:id="_sIOIkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Substitution_Shape_CN" identifier="org.eclipse.papyrus.umldi.Substitution_Shape_CN" name="Substitution Shape CN" hint="Substitution_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7Sf0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Substitution.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Substitution"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionInputShape" name="Value Pin Call Behavior Action Input Shape" hint="ValuePin_CallBehaviorActionInputShape">
-    <iconEntry xmi:id="_sIWrcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TemplateBinding_Edge" identifier="org.eclipse.papyrus.umldi.TemplateBinding_Edge" name="Template Binding Edge" hint="TemplateBinding_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sWPWcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TemplateBinding.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TemplateBinding"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionArgumentShape" name="Value Pin Call Operation Action Argument Shape" hint="ValuePin_CallOperationActionArgumentShape">
-    <iconEntry xmi:id="_sJes0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TemplateParameter_TemplateParameterLabel" identifier="org.eclipse.papyrus.umldi.TemplateParameter_TemplateParameterLabel" name="Template Parameter Template Parameter Label" hint="TemplateParameter_TemplateParameterLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sh6a8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TemplateParameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TemplateParameter"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionInputShape" name="Value Pin Call Operation Action Input Shape" hint="ValuePin_CallOperationActionInputShape">
-    <iconEntry xmi:id="_sJnPsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TemplateSignature_Shape" identifier="org.eclipse.papyrus.umldi.TemplateSignature_Shape" name="Template Signature Shape" hint="TemplateSignature_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_ry5_4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TemplateSignature"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionTargetShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionTargetShape" name="Value Pin Call Operation Action Target Shape" hint="ValuePin_CallOperationActionTargetShape">
-    <iconEntry xmi:id="_sJWJ8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TemplateSignature_Shape_CN" identifier="org.eclipse.papyrus.umldi.TemplateSignature_Shape_CN" name="Template Signature Shape CN" hint="TemplateSignature_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r5beoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TemplateSignature.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TemplateSignature"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ClearAssociationActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ClearAssociationActionInputShape" name="Value Pin Clear Association Action Input Shape" hint="ValuePin_ClearAssociationActionInputShape">
-    <iconEntry xmi:id="_sGNWYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TestIdentityAction_Shape" identifier="org.eclipse.papyrus.umldi.TestIdentityAction_Shape" name="Test Identity Action Shape" hint="TestIdentityAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0GSsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TestIdentityAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TestIdentityAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ClearAssociationActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ClearAssociationActionObjectShape" name="Value Pin Clear Association Action Object Shape" hint="ValuePin_ClearAssociationActionObjectShape">
-    <iconEntry xmi:id="_sGEzgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_LocalPostconditionShape" identifier="org.eclipse.papyrus.umldi.TimeConstraint_LocalPostconditionShape" name="Time Constraint Local Postcondition Shape" hint="TimeConstraint_LocalPostconditionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r9zBQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ClearStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ClearStructuralFeatureActionInputShape" name="Value Pin Clear Structural Feature Action Input Shape" hint="ValuePin_ClearStructuralFeatureActionInputShape">
-    <iconEntry xmi:id="_sObeQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_LocalPreconditionShape" identifier="org.eclipse.papyrus.umldi.TimeConstraint_LocalPreconditionShape" name="Time Constraint Local Precondition Shape" hint="TimeConstraint_LocalPreconditionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-HxYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint_As_UML::Action::localPrecondition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ClearStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ClearStructuralFeatureActionObjectShape" name="Value Pin Clear Structural Feature Action Object Shape" hint="ValuePin_ClearStructuralFeatureActionObjectShape">
-    <iconEntry xmi:id="_sOTicNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_PostconditionLabel" identifier="org.eclipse.papyrus.umldi.TimeConstraint_PostconditionLabel" name="Time Constraint Postcondition Label" hint="TimeConstraint_PostconditionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sg2D8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ClearVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ClearVariableActionInputShape" name="Value Pin Clear Variable Action Input Shape" hint="ValuePin_ClearVariableActionInputShape">
-    <iconEntry xmi:id="_sPJ3ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_PreconditionLabel" identifier="org.eclipse.papyrus.umldi.TimeConstraint_PreconditionLabel" name="Time Constraint Precondition Label" hint="TimeConstraint_PreconditionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_shRhwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ConditionalNodeInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ConditionalNodeInputShape" name="Value Pin Conditional Node Input Shape" hint="ValuePin_ConditionalNodeInputShape">
-    <iconEntry xmi:id="_sIlU8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_Shape" identifier="org.eclipse.papyrus.umldi.TimeConstraint_Shape" name="Time Constraint Shape" hint="TimeConstraint_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1NF8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CreateLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CreateLinkActionInputShape" name="Value Pin Create Link Action Input Shape" hint="ValuePin_CreateLinkActionInputShape">
-    <iconEntry xmi:id="_sHGHMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeConstraint_Shape_CN" identifier="org.eclipse.papyrus.umldi.TimeConstraint_Shape_CN" name="Time Constraint Shape CN" hint="TimeConstraint_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r8KpkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeConstraint.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeConstraint"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CreateLinkObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CreateLinkObjectActionInputShape" name="Value Pin Create Link Object Action Input Shape" hint="ValuePin_CreateLinkObjectActionInputShape">
-    <iconEntry xmi:id="_sQ0D4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeEvent_Shape" identifier="org.eclipse.papyrus.umldi.TimeEvent_Shape" name="Time Event Shape" hint="TimeEvent_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAGuYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeEvent"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CreateObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CreateObjectActionInputShape" name="Value Pin Create Object Action Input Shape" hint="ValuePin_CreateObjectActionInputShape">
-    <iconEntry xmi:id="_sQQqQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeExpression_Shape" identifier="org.eclipse.papyrus.umldi.TimeExpression_Shape" name="Time Expression Shape" hint="TimeExpression_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3-GENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeExpression"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_DestroyLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_DestroyLinkActionInputShape" name="Value Pin Destroy Link Action Input Shape" hint="ValuePin_DestroyLinkActionInputShape">
-    <iconEntry xmi:id="_sNUD8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeExpression_Shape_CN" identifier="org.eclipse.papyrus.umldi.TimeExpression_Shape_CN" name="Time Expression Shape CN" hint="TimeExpression_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7n3ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeExpression.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeExpression"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_DestroyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_DestroyObjectActionInputShape" name="Value Pin Destroy Object Action Input Shape" hint="ValuePin_DestroyObjectActionInputShape">
-    <iconEntry xmi:id="_sOyqoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeInterval_Shape" identifier="org.eclipse.papyrus.umldi.TimeInterval_Shape" name="Time Interval Shape" hint="TimeInterval_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sAw1sNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeInterval.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeInterval"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_DestroyObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.ValuePin_DestroyObjectActionTargetShape" name="Value Pin Destroy Object Action Target Shape" hint="ValuePin_DestroyObjectActionTargetShape">
-    <iconEntry xmi:id="_sOqHwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeObservation_EventEdge" identifier="org.eclipse.papyrus.umldi.TimeObservation_EventEdge" name="Time Observation Event Edge" hint="TimeObservation_EventEdge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sXVioNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeObservation.Event"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ExpansionRegionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ExpansionRegionInputShape" name="Value Pin Expansion Region Input Shape" hint="ValuePin_ExpansionRegionInputShape">
-    <iconEntry xmi:id="_sJ15MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeObservation_Shape" identifier="org.eclipse.papyrus.umldi.TimeObservation_Shape" name="Time Observation Shape" hint="TimeObservation_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r3SwoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeObservation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_LoopNodeInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_LoopNodeInputShape" name="Value Pin Loop Node Input Shape" hint="ValuePin_LoopNodeInputShape">
-    <iconEntry xmi:id="_sGuTwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.TimeObservation_Shape_CN" identifier="org.eclipse.papyrus.umldi.TimeObservation_Shape_CN" name="Time Observation Shape CN" hint="TimeObservation_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6_k4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/TimeObservation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.TimeObservation"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_LoopNodeVariableInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_LoopNodeVariableInputShape" name="Value Pin Loop Node Variable Input Shape" hint="ValuePin_LoopNodeVariableInputShape">
-    <iconEntry xmi:id="_sGlw4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Transition_Edge" identifier="org.eclipse.papyrus.umldi.Transition_Edge" name="Transition Edge" hint="Transition_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sVfvkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Transition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Transition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_OpaqueActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_OpaqueActionInputShape" name="Value Pin Opaque Action Input Shape" hint="ValuePin_OpaqueActionInputShape">
-    <iconEntry xmi:id="_sO-Q0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Transition_InternalTransitionLabel" identifier="org.eclipse.papyrus.umldi.Transition_InternalTransitionLabel" name="Transition Internal Transition Label" hint="Transition_InternalTransitionLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sf624Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Transition.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Transition"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RaiseExceptionActionExceptionShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RaiseExceptionActionExceptionShape" name="Value Pin Raise Exception Action Exception Shape" hint="ValuePin_RaiseExceptionActionExceptionShape">
-    <iconEntry xmi:id="_sQfTwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Trigger_DeferrableTriggerLabel" identifier="org.eclipse.papyrus.umldi.Trigger_DeferrableTriggerLabel" name="Trigger Deferrable Trigger Label" hint="Trigger_DeferrableTriggerLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sfD7QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Trigger.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Trigger"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RaiseExceptionActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RaiseExceptionActionInputShape" name="Value Pin Raise Exception Action Input Shape" hint="ValuePin_RaiseExceptionActionInputShape">
-    <iconEntry xmi:id="_sQn2oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UnmarshallAction_Shape" identifier="org.eclipse.papyrus.umldi.UnmarshallAction_Shape" name="Unmarshall Action Shape" hint="UnmarshallAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2JhINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UnmarshallAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UnmarshallAction"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadExtentActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadExtentActionInputShape" name="Value Pin Read Extent Action Input Shape" hint="ValuePin_ReadExtentActionInputShape">
-    <iconEntry xmi:id="_sMdvYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Usage_Edge" identifier="org.eclipse.papyrus.umldi.Usage_Edge" name="Usage Edge" hint="Usage_Edge" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sVdTUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Usage"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadIsClassifiedObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadIsClassifiedObjectActionInputShape" name="Value Pin Read Is Classified Object Action Input Shape" hint="ValuePin_ReadIsClassifiedObjectActionInputShape">
-    <iconEntry xmi:id="_sKZS0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Usage_Shape" identifier="org.eclipse.papyrus.umldi.Usage_Shape" name="Usage Shape" hint="Usage_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r0LyQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Usage"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadIsClassifiedObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadIsClassifiedObjectActionObjectShape" name="Value Pin Read Is Classified Object Action Object Shape" hint="ValuePin_ReadIsClassifiedObjectActionObjectShape">
-    <iconEntry xmi:id="_sKQv8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.Usage_Shape_CN" identifier="org.eclipse.papyrus.umldi.Usage_Shape_CN" name="Usage Shape CN" hint="Usage_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r7HgsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/Usage.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.Usage"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadLinkActionInputShape" name="Value Pin Read Link Action Input Shape" hint="ValuePin_ReadLinkActionInputShape">
-    <iconEntry xmi:id="_sE-nUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_ClassNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.UseCase_ClassNestedClassifierLabel" name="Use Case Class Nested Classifier Label" hint="UseCase_ClassNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.UseCase_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sc3i4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndActionInputShape" name="Value Pin Read Link Object End Action Input Shape" hint="ValuePin_ReadLinkObjectEndActionInputShape">
-    <iconEntry xmi:id="_sL35gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_ClassifierShape" identifier="org.eclipse.papyrus.umldi.UseCase_ClassifierShape" name="Use Case Classifier Shape" hint="UseCase_ClassifierShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r80w4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndActionObjectShape" name="Value Pin Read Link Object End Action Object Shape" hint="ValuePin_ReadLinkObjectEndActionObjectShape">
-    <iconEntry xmi:id="_sLvWoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_ComponentNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.UseCase_ComponentNestedClassifierLabel" name="Use Case Component Nested Classifier Label" hint="UseCase_ComponentNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.UseCase_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sc6mMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndQualifierActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndQualifierActionInputShape" name="Value Pin Read Link Object End Qualifier Action Input Shape" hint="ValuePin_ReadLinkObjectEndQualifierActionInputShape">
-    <iconEntry xmi:id="_sD1-4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_InterfaceNestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.UseCase_InterfaceNestedClassifierLabel" name="Use Case Interface Nested Classifier Label" hint="UseCase_InterfaceNestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" specializedTypes="org.eclipse.papyrus.umldi.UseCase_NestedClassifierLabel">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sc9pgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndQualifierActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndQualifierActionObjectShape" name="Value Pin Read Link Object End Qualifier Action Object Shape" hint="ValuePin_ReadLinkObjectEndQualifierActionObjectShape">
-    <iconEntry xmi:id="_sDtcANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_NestedClassifierLabel" identifier="org.eclipse.papyrus.umldi.UseCase_NestedClassifierLabel" name="Use Case Nested Classifier Label" hint="UseCase_NestedClassifierLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sc1GoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadSelfActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadSelfActionInputShape" name="Value Pin Read Self Action Input Shape" hint="ValuePin_ReadSelfActionInputShape">
-    <iconEntry xmi:id="_sKBfYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_OwnedUseCaseLabel" identifier="org.eclipse.papyrus.umldi.UseCase_OwnedUseCaseLabel" name="Use Case Owned Use Case Label" hint="UseCase_OwnedUseCaseLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_skB60Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadStructuralFeatureActionInputShape" name="Value Pin Read Structural Feature Action Input Shape" hint="ValuePin_ReadStructuralFeatureActionInputShape">
-    <iconEntry xmi:id="_sOE48Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_Shape" identifier="org.eclipse.papyrus.umldi.UseCase_Shape" name="Use Case Shape" hint="UseCase_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r2nbMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadStructuralFeatureActionObjectShape" name="Value Pin Read Structural Feature Action Object Shape" hint="ValuePin_ReadStructuralFeatureActionObjectShape">
-    <iconEntry xmi:id="_sN8WENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_Shape_CCN" identifier="org.eclipse.papyrus.umldi.UseCase_Shape_CCN" name="Use Case Shape CCN" hint="UseCase_Shape_CCN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r-XpANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase_As_UML::Classifier::ownedUseCase"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadVariableActionInputShape" name="Value Pin Read Variable Action Input Shape" hint="ValuePin_ReadVariableActionInputShape">
-    <iconEntry xmi:id="_sPzXQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_Shape_CN" identifier="org.eclipse.papyrus.umldi.UseCase_Shape_CN" name="Use Case Shape CN" hint="UseCase_Shape_CN" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r6cyUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReclassifyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReclassifyObjectActionInputShape" name="Value Pin Reclassify Object Action Input Shape" hint="ValuePin_ReclassifyObjectActionInputShape">
-    <iconEntry xmi:id="_sICiYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.UseCase_UseCaseLabel" identifier="org.eclipse.papyrus.umldi.UseCase_UseCaseLabel" name="Use Case Use Case Label" hint="UseCase_UseCaseLabel" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_skRLYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/UseCase.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.UseCase"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReclassifyObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReclassifyObjectActionObjectShape" name="Value Pin Reclassify Object Action Object Shape" hint="ValuePin_ReclassifyObjectActionObjectShape">
-    <iconEntry xmi:id="_sH5_gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AcceptCallActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AcceptCallActionInputShape" name="Value Pin Accept Call Action Input Shape" hint="ValuePin_AcceptCallActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKojYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReduceActionCollectionShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReduceActionCollectionShape" name="Value Pin Reduce Action Collection Shape" hint="ValuePin_ReduceActionCollectionShape">
-    <iconEntry xmi:id="_sFtnINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AcceptEventActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AcceptEventActionInputShape" name="Value Pin Accept Event Action Input Shape" hint="ValuePin_AcceptEventActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIz-cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReduceActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReduceActionInputShape" name="Value Pin Reduce Action Input Shape" hint="ValuePin_ReduceActionInputShape">
-    <iconEntry xmi:id="_sF2KANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionInputShape" name="Value Pin Add Structural Feature Value Action Input Shape" hint="ValuePin_AddStructuralFeatureValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNFacNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionInputShape" name="Value Pin Remove Structural Feature Value Action Input Shape" hint="ValuePin_RemoveStructuralFeatureValueActionInputShape">
-    <iconEntry xmi:id="_sHrWANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionInsertAtShape" name="Value Pin Add Structural Feature Value Action Insert At Shape" hint="ValuePin_AddStructuralFeatureValueActionInsertAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMsY4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::insertAt"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionObjectShape" name="Value Pin Remove Structural Feature Value Action Object Shape" hint="ValuePin_RemoveStructuralFeatureValueActionObjectShape">
-    <iconEntry xmi:id="_sHizINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionObjectShape" name="Value Pin Add Structural Feature Value Action Object Shape" hint="ValuePin_AddStructuralFeatureValueActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sM83kNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionRemoveAtShape" name="Value Pin Remove Structural Feature Value Action Remove At Shape" hint="ValuePin_RemoveStructuralFeatureValueActionRemoveAtShape">
-    <iconEntry xmi:id="_sHSUcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddStructuralFeatureValueActionValueShape" name="Value Pin Add Structural Feature Value Action Value Shape" hint="ValuePin_AddStructuralFeatureValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sM07wNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::AddStructuralFeatureValueAction::value"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionValueShape" name="Value Pin Remove Structural Feature Value Action Value Shape" hint="ValuePin_RemoveStructuralFeatureValueActionValueShape">
-    <iconEntry xmi:id="_sHaQQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionInputShape" name="Value Pin Add Variable Value Action Input Shape" hint="ValuePin_AddVariableValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPnxENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionInputShape" name="Value Pin Remove Variable Value Action Input Shape" hint="ValuePin_RemoveVariableValueActionInputShape">
-    <iconEntry xmi:id="_sFhZ4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionInsertAtShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionInsertAtShape" name="Value Pin Add Variable Value Action Insert At Shape" hint="ValuePin_AddVariableValueActionInsertAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPWEQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::AddVariableValueAction::insertAt"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionRemoveAtShape" name="Value Pin Remove Variable Value Action Remove At Shape" hint="ValuePin_RemoveVariableValueActionRemoveAtShape">
-    <iconEntry xmi:id="_sFQ7MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ValuePin_AddVariableValueActionValueShape" name="Value Pin Add Variable Value Action Value Shape" hint="ValuePin_AddVariableValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPenINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionValueShape" name="Value Pin Remove Variable Value Action Value Shape" hint="ValuePin_RemoveVariableValueActionValueShape">
-    <iconEntry xmi:id="_sFZeENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_BroadcastSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ValuePin_BroadcastSignalActionArgumentShape" name="Value Pin Broadcast Signal Action Argument Shape" hint="ValuePin_BroadcastSignalActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLZ_cNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReplyActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReplyActionInputShape" name="Value Pin Reply Action Input Shape" hint="ValuePin_ReplyActionInputShape">
-    <iconEntry xmi:id="_sNwv4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_BroadcastSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_BroadcastSignalActionInputShape" name="Value Pin Broadcast Signal Action Input Shape" hint="ValuePin_BroadcastSignalActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLjJYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReplyActionReplyShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReplyActionReplyShape" name="Value Pin Reply Action Reply Shape" hint="ValuePin_ReplyActionReplyShape">
-    <iconEntry xmi:id="_sNgRMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionArgumentShape" name="Value Pin Call Behavior Action Argument Shape" hint="ValuePin_CallBehaviorActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIOIkNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReplyActionReturnShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReplyActionReturnShape" name="Value Pin Reply Action Return Shape" hint="ValuePin_ReplyActionReturnShape">
-    <iconEntry xmi:id="_sNo0ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionInputShape" name="Value Pin Call Behavior Action Input Shape" hint="ValuePin_CallBehaviorActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIWrcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionInputShape" name="Value Pin Send Object Action Input Shape" hint="ValuePin_SendObjectActionInputShape">
-    <iconEntry xmi:id="_sEVHENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionArgumentShape" name="Value Pin Call Operation Action Argument Shape" hint="ValuePin_CallOperationActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJes0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionRequestShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionRequestShape" name="Value Pin Send Object Action Request Shape" hint="ValuePin_SendObjectActionRequestShape">
-    <iconEntry xmi:id="_sEEoYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionInputShape" name="Value Pin Call Operation Action Input Shape" hint="ValuePin_CallOperationActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJnPsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionTargetShape" name="Value Pin Send Object Action Target Shape" hint="ValuePin_SendObjectActionTargetShape">
-    <iconEntry xmi:id="_sENLQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionTargetShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionTargetShape" name="Value Pin Call Operation Action Target Shape" hint="ValuePin_CallOperationActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJWJ8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::CallOperationAction::target"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionArgumentShape" name="Value Pin Send Signal Action Argument Shape" hint="ValuePin_SendSignalActionArgumentShape">
-    <iconEntry xmi:id="_sEpQINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ClearAssociationActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ClearAssociationActionInputShape" name="Value Pin Clear Association Action Input Shape" hint="ValuePin_ClearAssociationActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGNWYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionInputShape" name="Value Pin Send Signal Action Input Shape" hint="ValuePin_SendSignalActionInputShape">
-    <iconEntry xmi:id="_sEyaENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ClearAssociationActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ClearAssociationActionObjectShape" name="Value Pin Clear Association Action Object Shape" hint="ValuePin_ClearAssociationActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGEzgNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionTargetShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionTargetShape" name="Value Pin Send Signal Action Target Shape" hint="ValuePin_SendSignalActionTargetShape">
-    <iconEntry xmi:id="_sEgtQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ClearStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ClearStructuralFeatureActionInputShape" name="Value Pin Clear Structural Feature Action Input Shape" hint="ValuePin_ClearStructuralFeatureActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sObeQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SequenceNodeInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SequenceNodeInputShape" name="Value Pin Sequence Node Input Shape" hint="ValuePin_SequenceNodeInputShape">
-    <iconEntry xmi:id="_sGZjoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ClearStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ClearStructuralFeatureActionObjectShape" name="Value Pin Clear Structural Feature Action Object Shape" hint="ValuePin_ClearStructuralFeatureActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOTicNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_Shape" identifier="org.eclipse.papyrus.umldi.ValuePin_Shape" name="Value Pin Shape" hint="ValuePin_Shape">
-    <iconEntry xmi:id="_rzWr0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ClearVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ClearVariableActionInputShape" name="Value Pin Clear Variable Action Input Shape" hint="ValuePin_ClearVariableActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPJ3ANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StartClassifierBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StartClassifierBehaviorActionInputShape" name="Value Pin Start Classifier Behavior Action Input Shape" hint="ValuePin_StartClassifierBehaviorActionInputShape">
-    <iconEntry xmi:id="_sJKjwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ConditionalNodeInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ConditionalNodeInputShape" name="Value Pin Conditional Node Input Shape" hint="ValuePin_ConditionalNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sIlU8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StartClassifierBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StartClassifierBehaviorActionObjectShape" name="Value Pin Start Classifier Behavior Action Object Shape" hint="ValuePin_StartClassifierBehaviorActionObjectShape">
-    <iconEntry xmi:id="_sJCn8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CreateLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CreateLinkActionInputShape" name="Value Pin Create Link Action Input Shape" hint="ValuePin_CreateLinkActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHGHMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionArgumentShape" name="Value Pin Start Object Behavior Action Argument Shape" hint="ValuePin_StartObjectBehaviorActionArgumentShape">
-    <iconEntry xmi:id="_sLCzENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CreateLinkObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CreateLinkObjectActionInputShape" name="Value Pin Create Link Object Action Input Shape" hint="ValuePin_CreateLinkObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQ0D4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionInputShape" name="Value Pin Start Object Behavior Action Input Shape" hint="ValuePin_StartObjectBehaviorActionInputShape">
-    <iconEntry xmi:id="_sLLV8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_CreateObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_CreateObjectActionInputShape" name="Value Pin Create Object Action Input Shape" hint="ValuePin_CreateObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQQqQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionObjectShape" name="Value Pin Start Object Behavior Action Object Shape" hint="ValuePin_StartObjectBehaviorActionObjectShape">
-    <iconEntry xmi:id="_sK63QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_DestroyLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_DestroyLinkActionInputShape" name="Value Pin Destroy Link Action Input Shape" hint="ValuePin_DestroyLinkActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNUD8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StructuredActivityNodeInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StructuredActivityNodeInputShape" name="Value Pin Structured Activity Node Input Shape" hint="ValuePin_StructuredActivityNodeInputShape">
-    <iconEntry xmi:id="_sDhOwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_DestroyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_DestroyObjectActionInputShape" name="Value Pin Destroy Object Action Input Shape" hint="ValuePin_DestroyObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOyqoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionFirstShape" identifier="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionFirstShape" name="Value Pin Test Identity Action First Shape" hint="ValuePin_TestIdentityActionFirstShape">
-    <iconEntry xmi:id="_sC8nANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_DestroyObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.ValuePin_DestroyObjectActionTargetShape" name="Value Pin Destroy Object Action Target Shape" hint="ValuePin_DestroyObjectActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOqHwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionInputShape" name="Value Pin Test Identity Action Input Shape" hint="ValuePin_TestIdentityActionInputShape">
-    <iconEntry xmi:id="_sDPh8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ExpansionRegionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ExpansionRegionInputShape" name="Value Pin Expansion Region Input Shape" hint="ValuePin_ExpansionRegionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJ15MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionSecondShape" identifier="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionSecondShape" name="Value Pin Test Identity Action Second Shape" hint="ValuePin_TestIdentityActionSecondShape">
-    <iconEntry xmi:id="_sDG_ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_LoopNodeInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_LoopNodeInputShape" name="Value Pin Loop Node Input Shape" hint="ValuePin_LoopNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGuTwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_UnmarshallActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_UnmarshallActionInputShape" name="Value Pin Unmarshall Action Input Shape" hint="ValuePin_UnmarshallActionInputShape">
-    <iconEntry xmi:id="_sMPF4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_LoopNodeVariableInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_LoopNodeVariableInputShape" name="Value Pin Loop Node Variable Input Shape" hint="ValuePin_LoopNodeVariableInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGlw4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_UnmarshallActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_UnmarshallActionObjectShape" name="Value Pin Unmarshall Action Object Shape" hint="ValuePin_UnmarshallActionObjectShape">
-    <iconEntry xmi:id="_sMGjANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_OpaqueActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_OpaqueActionInputShape" name="Value Pin Opaque Action Input Shape" hint="ValuePin_OpaqueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sO-Q0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ValueSpecificationActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ValueSpecificationActionInputShape" name="Value Pin Value Specification Action Input Shape" hint="ValuePin_ValueSpecificationActionInputShape">
-    <iconEntry xmi:id="_sQBZsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RaiseExceptionActionExceptionShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RaiseExceptionActionExceptionShape" name="Value Pin Raise Exception Action Exception Shape" hint="ValuePin_RaiseExceptionActionExceptionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQfTwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValueSpecificationAction_Shape" identifier="org.eclipse.papyrus.umldi.ValueSpecificationAction_Shape" name="Value Specification Action Shape" hint="ValueSpecificationAction_Shape">
-    <iconEntry xmi:id="_r1YsINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValueSpecificationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypes xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValueSpecificationAction"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RaiseExceptionActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RaiseExceptionActionInputShape" name="Value Pin Raise Exception Action Input Shape" hint="ValuePin_RaiseExceptionActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQn2oNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:ExternallyRegisteredType" xmi:id="org.eclipse.gmf.runtime.emf.type.core.null" identifier="org.eclipse.gmf.runtime.emf.type.core.null" name="org.eclipse.gmf.runtime.emf.type.core.null"/>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadExtentActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadExtentActionInputShape" name="Value Pin Read Extent Action Input Shape" hint="ValuePin_ReadExtentActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMdvYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadIsClassifiedObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadIsClassifiedObjectActionInputShape" name="Value Pin Read Is Classified Object Action Input Shape" hint="ValuePin_ReadIsClassifiedObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKZS0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadIsClassifiedObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadIsClassifiedObjectActionObjectShape" name="Value Pin Read Is Classified Object Action Object Shape" hint="ValuePin_ReadIsClassifiedObjectActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKQv8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadLinkActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadLinkActionInputShape" name="Value Pin Read Link Action Input Shape" hint="ValuePin_ReadLinkActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sE-nUNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndActionInputShape" name="Value Pin Read Link Object End Action Input Shape" hint="ValuePin_ReadLinkObjectEndActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sL35gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndActionObjectShape" name="Value Pin Read Link Object End Action Object Shape" hint="ValuePin_ReadLinkObjectEndActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLvWoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndQualifierActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndQualifierActionInputShape" name="Value Pin Read Link Object End Qualifier Action Input Shape" hint="ValuePin_ReadLinkObjectEndQualifierActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sD1-4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndQualifierActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadLinkObjectEndQualifierActionObjectShape" name="Value Pin Read Link Object End Qualifier Action Object Shape" hint="ValuePin_ReadLinkObjectEndQualifierActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDtcANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadSelfActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadSelfActionInputShape" name="Value Pin Read Self Action Input Shape" hint="ValuePin_ReadSelfActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sKBfYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadStructuralFeatureActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadStructuralFeatureActionInputShape" name="Value Pin Read Structural Feature Action Input Shape" hint="ValuePin_ReadStructuralFeatureActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sOE48Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadStructuralFeatureActionObjectShape" name="Value Pin Read Structural Feature Action Object Shape" hint="ValuePin_ReadStructuralFeatureActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sN8WENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReadVariableActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReadVariableActionInputShape" name="Value Pin Read Variable Action Input Shape" hint="ValuePin_ReadVariableActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sPzXQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReclassifyObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReclassifyObjectActionInputShape" name="Value Pin Reclassify Object Action Input Shape" hint="ValuePin_ReclassifyObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sICiYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReclassifyObjectActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReclassifyObjectActionObjectShape" name="Value Pin Reclassify Object Action Object Shape" hint="ValuePin_ReclassifyObjectActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sH5_gNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReduceActionCollectionShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReduceActionCollectionShape" name="Value Pin Reduce Action Collection Shape" hint="ValuePin_ReduceActionCollectionShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFtnINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReduceActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReduceActionInputShape" name="Value Pin Reduce Action Input Shape" hint="ValuePin_ReduceActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sF2KANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionInputShape" name="Value Pin Remove Structural Feature Value Action Input Shape" hint="ValuePin_RemoveStructuralFeatureValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHrWANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionObjectShape" name="Value Pin Remove Structural Feature Value Action Object Shape" hint="ValuePin_RemoveStructuralFeatureValueActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHizINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionRemoveAtShape" name="Value Pin Remove Structural Feature Value Action Remove At Shape" hint="ValuePin_RemoveStructuralFeatureValueActionRemoveAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHSUcNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveStructuralFeatureValueActionValueShape" name="Value Pin Remove Structural Feature Value Action Value Shape" hint="ValuePin_RemoveStructuralFeatureValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sHaQQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionInputShape" name="Value Pin Remove Variable Value Action Input Shape" hint="ValuePin_RemoveVariableValueActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFhZ4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionRemoveAtShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionRemoveAtShape" name="Value Pin Remove Variable Value Action Remove At Shape" hint="ValuePin_RemoveVariableValueActionRemoveAtShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFQ7MNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionValueShape" identifier="org.eclipse.papyrus.umldi.ValuePin_RemoveVariableValueActionValueShape" name="Value Pin Remove Variable Value Action Value Shape" hint="ValuePin_RemoveVariableValueActionValueShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sFZeENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReplyActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReplyActionInputShape" name="Value Pin Reply Action Input Shape" hint="ValuePin_ReplyActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNwv4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReplyActionReplyShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReplyActionReplyShape" name="Value Pin Reply Action Reply Shape" hint="ValuePin_ReplyActionReplyShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNgRMNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ReplyActionReturnShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ReplyActionReturnShape" name="Value Pin Reply Action Return Shape" hint="ValuePin_ReplyActionReturnShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sNo0ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionInputShape" name="Value Pin Send Object Action Input Shape" hint="ValuePin_SendObjectActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEVHENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionRequestShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionRequestShape" name="Value Pin Send Object Action Request Shape" hint="ValuePin_SendObjectActionRequestShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEEoYNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::object"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionTargetShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionTargetShape" name="Value Pin Send Object Action Target Shape" hint="ValuePin_SendObjectActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sENLQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::SendObjectAction::request"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionArgumentShape" name="Value Pin Send Signal Action Argument Shape" hint="ValuePin_SendSignalActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEpQINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionInputShape" name="Value Pin Send Signal Action Input Shape" hint="ValuePin_SendSignalActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEyaENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionTargetShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionTargetShape" name="Value Pin Send Signal Action Target Shape" hint="ValuePin_SendSignalActionTargetShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sEgtQNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::SendSignalAction::target"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_SequenceNodeInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_SequenceNodeInputShape" name="Value Pin Sequence Node Input Shape" hint="ValuePin_SequenceNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sGZjoNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_Shape" identifier="org.eclipse.papyrus.umldi.ValuePin_Shape" name="Value Pin Shape" hint="ValuePin_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_rzWr0Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StartClassifierBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StartClassifierBehaviorActionInputShape" name="Value Pin Start Classifier Behavior Action Input Shape" hint="ValuePin_StartClassifierBehaviorActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJKjwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StartClassifierBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StartClassifierBehaviorActionObjectShape" name="Value Pin Start Classifier Behavior Action Object Shape" hint="ValuePin_StartClassifierBehaviorActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sJCn8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionArgumentShape" name="Value Pin Start Object Behavior Action Argument Shape" hint="ValuePin_StartObjectBehaviorActionArgumentShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLCzENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionInputShape" name="Value Pin Start Object Behavior Action Input Shape" hint="ValuePin_StartObjectBehaviorActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sLLV8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StartObjectBehaviorActionObjectShape" name="Value Pin Start Object Behavior Action Object Shape" hint="ValuePin_StartObjectBehaviorActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sK63QNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::StartObjectBehaviorAction::object"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_StructuredActivityNodeInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_StructuredActivityNodeInputShape" name="Value Pin Structured Activity Node Input Shape" hint="ValuePin_StructuredActivityNodeInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDhOwNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionFirstShape" identifier="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionFirstShape" name="Value Pin Test Identity Action First Shape" hint="ValuePin_TestIdentityActionFirstShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sC8nANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionInputShape" name="Value Pin Test Identity Action Input Shape" hint="ValuePin_TestIdentityActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDPh8Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionSecondShape" identifier="org.eclipse.papyrus.umldi.ValuePin_TestIdentityActionSecondShape" name="Value Pin Test Identity Action Second Shape" hint="ValuePin_TestIdentityActionSecondShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sDG_ENx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml-containments.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin_As_UML::TestIdentityAction::second"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_UnmarshallActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_UnmarshallActionInputShape" name="Value Pin Unmarshall Action Input Shape" hint="ValuePin_UnmarshallActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMPF4Nx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_UnmarshallActionObjectShape" identifier="org.eclipse.papyrus.umldi.ValuePin_UnmarshallActionObjectShape" name="Value Pin Unmarshall Action Object Shape" hint="ValuePin_UnmarshallActionObjectShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sMGjANx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValuePin_ValueSpecificationActionInputShape" identifier="org.eclipse.papyrus.umldi.ValuePin_ValueSpecificationActionInputShape" name="Value Pin Value Specification Action Input Shape" hint="ValuePin_ValueSpecificationActionInputShape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_sQBZsNx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValuePin.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValuePin"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.umldi.ValueSpecificationAction_Shape" identifier="org.eclipse.papyrus.umldi.ValueSpecificationAction_Shape" name="Value Specification Action Shape" hint="ValueSpecificationAction_Shape" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+    <iconEntry xmi:type="elementtypesconfigurations:IconEntry" xmi:id="_r1YsINx2EeWVxMf7SXAfhg" iconPath="/icons/full/obj16/ValueSpecificationAction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+    <specializedTypes xmi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#org.eclipse.papyrus.uml.ValueSpecificationAction"/>
+  </elementTypeConfigurations>
+  <elementTypeConfigurations xmi:type="elementtypesconfigurations:ExternallyRegisteredType" xmi:id="org.eclipse.gmf.runtime.emf.type.core.null" identifier="org.eclipse.gmf.runtime.emf.type.core.null" name="org.eclipse.gmf.runtime.emf.type.core.null" hint="" kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"/>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml
index 62ade205f1f..7c0e30ff595 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/pom.xml
@@ -7,6 +7,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.service.types</artifactId>
-	<version>3.1.100-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InteractionFragmentContainerEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InteractionFragmentContainerEditHelperAdvice.java
index d0edddb3758..d532871b9f7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InteractionFragmentContainerEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InteractionFragmentContainerEditHelperAdvice.java
@@ -31,7 +31,7 @@ import org.eclipse.uml2.uml.InteractionOperand;
  * Edit-helper advice for elements that own {@link InteractionFragment}s, being
  * {@link Interaction}s and {@link InteractionOperand}s.
  * 
- * @since 3.1
+ * @since 4.0
  */
 public class InteractionFragmentContainerEditHelperAdvice extends AbstractEditHelperAdvice {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InteractionOperandEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InteractionOperandEditHelperAdvice.java
index f981a3c3bb3..ab22fb2eb93 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InteractionOperandEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/InteractionOperandEditHelperAdvice.java
@@ -35,7 +35,7 @@ import org.eclipse.uml2.uml.InteractionOperand;
 /**
  * Edit-helper advice for {@link InteractionOperand}s.
  * 
- * @since 3.1
+ * @since 4.0
  */
 public class InteractionOperandEditHelperAdvice extends InteractionFragmentContainerEditHelperAdvice {
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF
index 0785530d4d0..66d97901610 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/META-INF/MANIFEST.MF
@@ -2,16 +2,17 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.uml2.uml.edit;bundle-version="[5.3.0,6.0.0)";visibility:=reexport,
  org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.infra.types.rulebased;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types.rulebased;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.emf.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.100,2.0.0)"
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.100,2.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)"
 Export-Package: org.eclipse.papyrus.uml.types.core,
  org.eclipse.papyrus.uml.types.core.advices.applystereotype,
  org.eclipse.papyrus.uml.types.core.advices.applystereotype.impl,
@@ -40,7 +41,7 @@ Export-Package: org.eclipse.papyrus.uml.types.core,
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.core/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.types.core/pom.xml
index 562dd062b19..4881f967c15 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.core/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.core/pom.xml
@@ -8,6 +8,6 @@
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.types.core</artifactId>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/META-INF/MANIFEST.MF
index c936b8dd87a..8b4889d4607 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Require-Bundle: org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.emf.types;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.papyrus.uml.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.types.core;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 3.1.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/pom.xml
index 9e5cf81304a..bbcb8d9f8e8 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/pom.xml
@@ -11,6 +11,6 @@
 		<relativePath>../../toolsmiths/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.types.ui.properties</artifactId>
-	<version>3.1.0-SNAPSHOT</version>
+	<version>3.1.100-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
index 36b7093c619..a3733f03bc6 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=
  org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.uml.internationalization.edit;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 4.0.0.qualifier