From 7362a5d83ec19f5fe8b59b897357ba05ff577d27 Mon Sep 17 00:00:00 2001
From: Stephane Drapeau <Stephane.Drapeau@obeo.fr>
Date: Tue, 2 Apr 2024 10:44:58 +0100
Subject: [PATCH] Added feature to copy/paste semantic elements and graphical
 style

Change-Id: I0950fdfac51e4a74241c764e530166e85d25fb83
---
 .../description/BPMN2.odesign                 |  58 ++--
 .../design/CopySiriusGMFStylesHelper.java     | 267 ++++++++++++++++++
 .../bpmn2/design/ProcessService.java          |  44 +--
 .../design/refactoring/EdgeLayoutData.java    |  54 +---
 .../bpmn2/design/refactoring/EndLayout.java   |   9 +-
 .../bpmn2/design/refactoring/NodeLayout.java  |  22 +-
 .../refactoring/RepresentationLayout.java     |  10 +
 .../refactoring/SiriusElementRefactor.java    |  32 +--
 .../bpmn2/design/util/GMFHelper.java          |  25 ++
 .../bpmn2/design/util/GMFStyleCopier.java     |  74 +++++
 .../bpmn2/design/util/SiriusHelper.java       | 171 +++++++++++
 .../SiriusStyleCopier.java}                   | 103 ++++---
 12 files changed, 679 insertions(+), 190 deletions(-)
 create mode 100644 plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/CopySiriusGMFStylesHelper.java
 create mode 100644 plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/GMFHelper.java
 create mode 100644 plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/GMFStyleCopier.java
 create mode 100644 plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/SiriusHelper.java
 rename plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/{refactoring/SiriusElementRefactorHelper.java => util/SiriusStyleCopier.java} (67%)

diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign b/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign
index d2161325..e9a746f4 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/description/BPMN2.odesign
@@ -462,7 +462,7 @@
             <copiedView name="copiedView"/>
             <copiedElement name="copiedElement"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:container.paste(containerView, copiedView, copiedElement)"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:container.paste(containerView, copiedView, copiedElement)"/>
             </initialOperation>
           </ownedTools>
           <ownedTools xsi:type="tool_1:DeleteElementDescription" name="DeleteSubProcess" forceRefresh="true">
@@ -1816,80 +1816,80 @@
           </style>
         </edgeMappings>
         <containerMappings name="Participant" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.1/@ownedTools[name='DeleteParticipant']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.participants" semanticElements="aql:self.processRef" doubleClickDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='LaneSet_AutosizeLanes_DoubleClick']" domainClass="bpmn2.Participant" childrenPresentation="VerticalStack">
-          <subContainerMappings name="Lane" label="Lane" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.processRef.laneSets->first().lanes" domainClass="bpmn2.Lane" dropDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveExtensionValueToLane'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveFlowElementToLane']" reusedContainerMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']">
-            <subNodeMappings name="ExternalLabel" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:containerView.getElementsWithExternalLabel()" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BaseElement">
+          <subContainerMappings name="Lane" label="Lane" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.processRef.laneSets->first().lanes" domainClass="bpmn2.Lane" dropDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveExtensionValueToLane'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveFlowElementToLane']" reusedContainerMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']">
+            <subNodeMappings name="ExternalLabel" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:containerView.getElementsWithExternalLabel()" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BaseElement">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" borderColor="//@userColorsPalettes[name='Colors']/@entries[name='LightYellow']" showIcon="false" labelExpression="aql:self.getExternalLabel()" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" sizeComputationExpression="aql:self.getExternalLabelSize()" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Colors']/@entries[name='LightYellow']"/>
             </subNodeMappings>
-            <subNodeMappings name="StartEvent" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('StartEvent')" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.StartEvent">
+            <subNodeMappings name="StartEvent" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('StartEvent')" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.StartEvent">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/start-event/start.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="EndEvent" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('EndEvent')" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.EndEvent">
+            <subNodeMappings name="EndEvent" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('EndEvent')" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.EndEvent">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/end-event/end.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="IntermediateCatchEvent" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('IntermediateCatchEvent')" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.IntermediateCatchEvent">
+            <subNodeMappings name="IntermediateCatchEvent" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('IntermediateCatchEvent')" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.IntermediateCatchEvent">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/catch-event/none.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="IntermediateThrowEvent" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('IntermediateThrowEvent')" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.IntermediateThrowEvent">
+            <subNodeMappings name="IntermediateThrowEvent" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('IntermediateThrowEvent')" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.IntermediateThrowEvent">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/throw-event/none.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="ParallelGateway" label="Parallel Gateway" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('ParallelGateway')" domainClass="bpmn2.ParallelGateway">
+            <subNodeMappings name="ParallelGateway" label="Parallel Gateway" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('ParallelGateway')" domainClass="bpmn2.ParallelGateway">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" sizeComputationExpression="4" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/gateway/parallel-gateway.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="InclusiveGateway" label="Inclusive Gateway" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('InclusiveGateway')" domainClass="bpmn2.InclusiveGateway">
+            <subNodeMappings name="InclusiveGateway" label="Inclusive Gateway" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('InclusiveGateway')" domainClass="bpmn2.InclusiveGateway">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" sizeComputationExpression="4" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/gateway/inclusive-gateway.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="ExclusiveGateway" label="Exclusive Gateway" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('ExclusiveGateway')" domainClass="bpmn2.ExclusiveGateway">
+            <subNodeMappings name="ExclusiveGateway" label="Exclusive Gateway" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('ExclusiveGateway')" domainClass="bpmn2.ExclusiveGateway">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" sizeComputationExpression="4" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/gateway/exclusive-gateway.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="ComplexGateway" label="Complex Gateway" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('ComplexGateway')" domainClass="bpmn2.ComplexGateway">
+            <subNodeMappings name="ComplexGateway" label="Complex Gateway" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('ComplexGateway')" domainClass="bpmn2.ComplexGateway">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" sizeComputationExpression="4" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/gateway/complex-gateway.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="EventBasedGateway" label="EventBased Gateway" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('EventBasedGateway')" domainClass="bpmn2.EventBasedGateway">
+            <subNodeMappings name="EventBasedGateway" label="EventBased Gateway" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('EventBasedGateway')" domainClass="bpmn2.EventBasedGateway">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" sizeComputationExpression="4" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/gateway/event-based-gateway.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="TextAnnotation" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@additionalLayers[name='Process']/@toolSections.6/@ownedTools[name='TextAnnotationDirectEdit']" semanticCandidatesExpression="aql:self.extensionValues.value->filter(bpmn2::TextAnnotation)" domainClass="bpmn2.TextAnnotation">
+            <subNodeMappings name="TextAnnotation" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@additionalLayers[name='Process']/@toolSections.6/@ownedTools[name='TextAnnotationDirectEdit']" semanticCandidatesExpression="aql:self.extensionValues.value->filter(bpmn2::TextAnnotation)" domainClass="bpmn2.TextAnnotation">
               <style xsi:type="style:SquareDescription" borderColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" labelExpression="feature:text" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" labelAlignment="LEFT" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Colors']/@entries[name='LightYellow']"/>
             </subNodeMappings>
-            <subNodeMappings name="DataObject " labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.extensionValues.value->filter(bpmn2::DataObject)" domainClass="bpmn2.DataObject">
+            <subNodeMappings name="DataObject " pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.extensionValues.value->filter(bpmn2::DataObject)" domainClass="bpmn2.DataObject">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/data/data-object.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="DataStore" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.extensionValues.value->filter(bpmn2::DataStore)" domainClass="bpmn2.DataStore">
+            <subNodeMappings name="DataStore" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.extensionValues.value->filter(bpmn2::DataStore)" domainClass="bpmn2.DataStore">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/data/data-store.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="DataInput" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getDataInputs()" domainClass="bpmn2.DataInput">
+            <subNodeMappings name="DataInput" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getDataInputs()" domainClass="bpmn2.DataInput">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/data/data-input.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subNodeMappings name="DataOutput" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getDataOutputs()" domainClass="bpmn2.DataOutput">
+            <subNodeMappings name="DataOutput" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getDataOutputs()" domainClass="bpmn2.DataOutput">
               <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/data/data-output.svg">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <subContainerMappings name="Task" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('Task')" domainClass="bpmn2.Task">
-              <borderedNodeMappings name="TaskBorder" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions" domainClass="bpmn2.BoundaryEvent">
+            <subContainerMappings name="Task" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('Task')" domainClass="bpmn2.Task">
+              <borderedNodeMappings name="TaskBorder" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions" domainClass="bpmn2.BoundaryEvent">
                 <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/boundary-events/none.svg">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 </style>
@@ -1898,8 +1898,8 @@
                 <labelFormat>bold</labelFormat>
               </style>
             </subContainerMappings>
-            <subContainerMappings name="CallActivity_Process" preconditionExpression="aql:self.calledElementRef.oclIsTypeOf(bpmn2::Process)" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteCallActivity']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('CallActivity')" semanticElements="aql:Sequence{self,self.calledElementRef})" domainClass="bpmn2.CallActivity">
-              <borderedNodeMappings name="TaskBorderOnCallActivity_Process" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BoundaryEvent">
+            <subContainerMappings name="CallActivity_Process" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" preconditionExpression="aql:self.calledElementRef.oclIsTypeOf(bpmn2::Process)" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteCallActivity']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('CallActivity')" semanticElements="aql:Sequence{self,self.calledElementRef})" domainClass="bpmn2.CallActivity">
+              <borderedNodeMappings name="TaskBorderOnCallActivity_Process" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BoundaryEvent">
                 <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/boundary-events/none.svg">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 </style>
@@ -1908,8 +1908,8 @@
                 <labelFormat>bold</labelFormat>
               </style>
             </subContainerMappings>
-            <subContainerMappings name="CallActivity_Task" preconditionExpression="aql:self.calledElementRef.oclIsKindOf(bpmn2::GlobalTask)" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteCallActivity']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('CallActivity')" semanticElements="aql:Sequence{self,self.calledElementRef})" domainClass="bpmn2.CallActivity">
-              <borderedNodeMappings name="TaskBorderOnCallActivity_Task" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BoundaryEvent">
+            <subContainerMappings name="CallActivity_Task" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" preconditionExpression="aql:self.calledElementRef.oclIsKindOf(bpmn2::GlobalTask)" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteCallActivity']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('CallActivity')" semanticElements="aql:Sequence{self,self.calledElementRef})" domainClass="bpmn2.CallActivity">
+              <borderedNodeMappings name="TaskBorderOnCallActivity_Task" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BoundaryEvent">
                 <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/boundary-events/none.svg">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 </style>
@@ -1918,8 +1918,8 @@
                 <labelFormat>bold</labelFormat>
               </style>
             </subContainerMappings>
-            <subContainerMappings name="SubProcess" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteSubProcess']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('SubProcess')" doubleClickDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='SubProcessToggleCollapse_DoubleClick']" domainClass="bpmn2.SubProcess" dropDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveFlowElementFromLaneToSubProcess']" reusedNodeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='StartEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ComplexGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EndEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EventBasedGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='InclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateCatchEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateThrowEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ParallelGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExternalLabel'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataInput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataObject%20'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataOutput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataStore'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='TextAnnotation'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Task'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess']/@borderedNodeMappings[name='TaskBorderOnSubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task']/@borderedNodeMappings[name='TaskBorder']" reusedContainerMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task']">
-              <borderedNodeMappings name="TaskBorderOnSubProcess" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BoundaryEvent">
+            <subContainerMappings name="SubProcess" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteSubProcess']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.getFlowNodeElements('SubProcess')" doubleClickDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='SubProcessToggleCollapse_DoubleClick']" domainClass="bpmn2.SubProcess" dropDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveFlowElementFromLaneToSubProcess']" reusedNodeMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='StartEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ComplexGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EndEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='EventBasedGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='InclusiveGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateCatchEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='IntermediateThrowEvent'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ParallelGateway'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='ExternalLabel'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataInput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataObject%20'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataOutput'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='DataStore'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subNodeMappings[name='TextAnnotation'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task']/@borderedNodeMappings[name='TaskBorderOnCallActivity_Task'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess']/@borderedNodeMappings[name='TaskBorderOnSubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task']/@borderedNodeMappings[name='TaskBorder']" reusedContainerMappings="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='Task'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='SubProcess'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Process'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@containerMappings[name='Participant']/@subContainerMappings[name='Lane']/@subContainerMappings[name='CallActivity_Task']">
+              <borderedNodeMappings name="TaskBorderOnSubProcess" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BoundaryEvent">
                 <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/sub-process-boundary-events/none.svg">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 </style>
@@ -1933,7 +1933,7 @@
                 </style>
               </conditionnalStyles>
             </subContainerMappings>
-            <subContainerMappings name="Group" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@additionalLayers[name='Process']/@toolSections.6/@ownedTools[name='GroupDirectEdit']" semanticCandidatesExpression="aql:self.extensionValues.value->filter(bpmn2::Group)" domainClass="bpmn2.Group">
+            <subContainerMappings name="Group" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='ProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste'] //@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='CollaborationDiagram']/@additionalLayers[name='Process']/@toolSections.6/@ownedTools[name='GroupDirectEdit']" semanticCandidatesExpression="aql:self.extensionValues.value->filter(bpmn2::Group)" domainClass="bpmn2.Group">
               <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="feature:description" widthComputationExpression="15" heightComputationExpression="3" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Colors']/@entries[name='LightYellow']" foregroundColor="//@userColorsPalettes[name='Colors']/@entries[name='LightYellow']">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -2145,7 +2145,7 @@
             <copiedView name="copiedView"/>
             <copiedElement name="copiedElement"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:container.paste(containerView, copiedView, copiedElement)"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:container.paste(containerView, copiedView, copiedElement)"/>
             </initialOperation>
           </ownedTools>
           <ownedTools xsi:type="tool_1:DeleteElementDescription" name="DeleteSubProcess" forceRefresh="true">
@@ -3849,7 +3849,7 @@
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </edgeMappings>
-        <containerMappings name="SubProcess" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteSubProcess']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self" doubleClickDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='SubProcessToggleCollapse_DoubleClick']" domainClass="bpmn2.SubProcess" dropDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveFlowElementFromLaneToSubProcess']">
+        <containerMappings name="SubProcess" pasteDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Paste']" deletionDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteSubProcess']" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self" doubleClickDescription="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='SubProcessToggleCollapse_DoubleClick']" domainClass="bpmn2.SubProcess" dropDescriptions="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveFlowElementFromLaneToSubProcess']">
           <borderedNodeMappings name="TaskBorderOnSubProcess" labelDirectEdit="//@ownedViewpoints[name='Process']/@ownedRepresentations[name='SubProcessDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='FlowElementNameEdit']" semanticCandidatesExpression="aql:self.boundaryEventRefs" semanticElements="aql:self.eventDefinitions->union(Sequence{self})" domainClass="bpmn2.BoundaryEvent">
             <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:self.getNonExternalLabel(view)" labelColor="//@userColorsPalettes[name='Colors']/@entries[name='TextBackground']" arcWidth="1" arcHeight="1" workspacePath="/org.obeonetwork.dsl.bpmn2.design/icons2/nodes/sub-process-boundary-events/none.svg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -4129,7 +4129,7 @@
             <copiedView name="copiedView"/>
             <copiedElement name="copiedElement"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:container.paste(containerView, copiedView, copiedElement)"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:container.paste(containerView, copiedView, copiedElement)"/>
             </initialOperation>
           </ownedTools>
           <ownedTools xsi:type="tool_1:DeleteElementDescription" name="DeleteSubProcess" forceRefresh="true">
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/CopySiriusGMFStylesHelper.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/CopySiriusGMFStylesHelper.java
new file mode 100644
index 00000000..812b2614
--- /dev/null
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/CopySiriusGMFStylesHelper.java
@@ -0,0 +1,267 @@
+/**
+ * Copyright (c) 2011-2024 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ * 
+ */
+package org.obeonetwork.bpmn2.design;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.Bounds;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.IdentityAnchor;
+import org.eclipse.gmf.runtime.notation.Location;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
+import org.eclipse.sirius.diagram.AbstractDNode;
+import org.eclipse.sirius.diagram.DDiagramElement;
+import org.eclipse.sirius.diagram.DEdge;
+import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.EdgeStyle;
+import org.eclipse.sirius.diagram.FlatContainerStyle;
+import org.eclipse.sirius.diagram.WorkspaceImage;
+import org.eclipse.sirius.viewpoint.Style;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.obeonetwork.bpmn2.design.util.GMFHelper;
+import org.obeonetwork.bpmn2.design.util.GMFStyleCopier;
+import org.obeonetwork.bpmn2.design.util.SiriusHelper;
+import org.obeonetwork.bpmn2.design.util.SiriusStyleCopier;
+import org.obeonetwork.dsl.bpmn2.BoundaryEvent;
+import org.obeonetwork.dsl.bpmn2.FlowNode;
+import org.obeonetwork.dsl.bpmn2.SequenceFlow;
+
+public class CopySiriusGMFStylesHelper {
+
+	public static void copyStyles(EObject newElement, DDiagramElement containerView, String oldId, String newId) {
+		if (newElement instanceof BoundaryEvent) {
+			copyBoundaryEvent((BoundaryEvent) newElement, containerView, oldId, newId);
+		} else if (newElement instanceof FlowNode) {
+			copyFlowNode((FlowNode) newElement, containerView, oldId, newId);
+		} else if (newElement instanceof SequenceFlow) {
+			copySequenceFlow((SequenceFlow) newElement, containerView, oldId, newId);
+		}
+	}
+
+	private static void copyBoundaryEvent(BoundaryEvent newElement, DDiagramElement containerView, String oldId,
+			String newId) {
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		IWorkbenchPage[] pages = workbench.getActiveWorkbenchWindow().getPages();
+		AbstractDNode oldAbstractDNode = SiriusHelper.getAbstractDNode(oldId, pages);
+		if (oldAbstractDNode != null) {
+			SiriusHelper.refresh((DSemanticDiagram) containerView.getParentDiagram());
+			// Update boundary event asynchronously.
+			Thread t = new Thread() {
+				public void run() {
+					int cpt = 0;
+					while (cpt < 100) {
+						AbstractDNode newAbstractDNode = SiriusHelper.getAbstractDNode(containerView.getParentDiagram(),
+								newId);
+						if (newAbstractDNode == null) {
+							try {
+								Thread.sleep(1000);
+								cpt++;
+							} catch (InterruptedException e) {
+								Activator.log(IStatus.ERROR, e.getMessage(), e);
+							}
+						} else {
+							TransactionalEditingDomain ted = (TransactionalEditingDomain) AdapterFactoryEditingDomain
+									.getEditingDomainFor(newAbstractDNode);
+							CommandStack commandStack = ted.getCommandStack();
+							commandStack.execute(new RecordingCommand(ted) {
+								@Override
+								protected void doExecute() {
+									updateStyles(oldAbstractDNode, newAbstractDNode);
+								}
+							});
+							return;
+						}
+					}
+				};
+			};
+			t.start();
+		}
+	}
+
+	private static void copyFlowNode(FlowNode newElement, DDiagramElement containerView, String oldId, String newId) {
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		IWorkbenchPage[] pages = workbench.getActiveWorkbenchWindow().getPages();
+		AbstractDNode oldAbstractDNode = SiriusHelper.getAbstractDNode(oldId, pages);
+
+		if (oldAbstractDNode != null) {
+			SiriusHelper.refresh((DSemanticDiagram) containerView.getParentDiagram());
+			AbstractDNode newAbstractDNode = SiriusHelper.getAbstractDNode(containerView.getParentDiagram(), newId);
+
+			if (newAbstractDNode != null) {
+				updateStyles(oldAbstractDNode, newAbstractDNode);
+			}
+		}
+	}
+
+	private static void copySequenceFlow(SequenceFlow newElement, DDiagramElement containerView, String oldId,
+			String newId) {
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		IWorkbenchPage[] pages = workbench.getActiveWorkbenchWindow().getPages();
+		// Update edges asynchronously.
+		Thread t = new Thread() {
+			public void run() {
+				int cpt = 0;
+				DEdge oldDEdge = SiriusHelper.getDEdge(oldId, pages);
+				if (oldDEdge != null) {
+					while (cpt < 100) {
+						DEdge newDEdge = SiriusHelper.getDEdge(containerView.getParentDiagram(), newId);
+						if (newDEdge == null) {
+							try {
+								Thread.sleep(1000);
+								cpt++;
+							} catch (InterruptedException e) {
+								Activator.log(IStatus.ERROR, e.getMessage(), e);
+							}
+						} else {
+							Edge newGMFEdge = (Edge) SiriusHelper.getGMFView(newDEdge);
+							if (newGMFEdge != null && newDEdge.getStyle() != null) {
+								updateStyles(oldDEdge, newDEdge);
+								return;
+							}
+						}
+					}
+				}
+			};
+		};
+		t.start();
+	}
+
+	private static void updateStyles(DEdge oldAbstractDNode, DEdge newAbstractDNode) {
+		Edge oldGMFView = (Edge) SiriusHelper.getGMFView(oldAbstractDNode);
+		Edge newGMFView = (Edge) SiriusHelper.getGMFView(newAbstractDNode);
+
+		RelativeBendpoints bendPoints = (RelativeBendpoints) oldGMFView.getBendpoints();
+		IdentityAnchor sourceAnchor = (IdentityAnchor) oldGMFView.getSourceAnchor();
+		IdentityAnchor targetAnchor = (IdentityAnchor) oldGMFView.getTargetAnchor();
+		EdgeStyle oldSiriusStyle = (oldAbstractDNode instanceof DEdge) ? (EdgeStyle) oldAbstractDNode.getStyle() : null;
+		EList<?> oldGMFStyles = oldGMFView.getStyles();
+
+		List<Node> labels = ((List<?>) oldGMFView.getPersistedChildren()).stream()
+				.filter(it -> GMFHelper.isGmfLabelNode(it)).map(Node.class::cast).collect(Collectors.toList());
+
+		TransactionalEditingDomain ted = (TransactionalEditingDomain) AdapterFactoryEditingDomain
+				.getEditingDomainFor(newAbstractDNode);
+		CommandStack commandStack = ted.getCommandStack();
+		commandStack.execute(new RecordingCommand(ted) {
+			@Override
+			protected void doExecute() {
+				RelativeBendpoints newBendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
+				List<RelativeBendpoint> list = new ArrayList<RelativeBendpoint>();
+				for (Object o : bendPoints.getPoints()) {
+					if (o instanceof RelativeBendpoint) {
+						RelativeBendpoint point = (RelativeBendpoint) o;
+						RelativeBendpoint newPoint = new RelativeBendpoint(point.getSourceX(), point.getSourceY(),
+								point.getTargetX(), point.getTargetY());
+						list.add(newPoint);
+					}
+				}
+				newBendpoints.setPoints(list);
+				newGMFView.setBendpoints(newBendpoints);
+
+				IdentityAnchor newSourceAnchor = (IdentityAnchor) newGMFView.getSourceAnchor();
+				IdentityAnchor newTargetAnchor = (IdentityAnchor) newGMFView.getTargetAnchor();
+				if (sourceAnchor != null) {
+					newSourceAnchor.setId(sourceAnchor.getId());
+				}
+				if (targetAnchor != null) {
+					newTargetAnchor.setId(targetAnchor.getId());
+				}
+				SiriusStyleCopier.updateEdgeStyle(newAbstractDNode, newGMFView, oldSiriusStyle, oldGMFStyles);
+				if (!labels.isEmpty()) {
+					GMFStyleCopier.updateLabels(newGMFView, labels);
+				}
+			}
+		});
+	}
+
+	private static void updateStyles(AbstractDNode oldAbstractDNode, AbstractDNode newAbstractDNode) {
+		Style oldStyle = oldAbstractDNode.getStyle();
+		Style newStyle = newAbstractDNode.getStyle();
+		if (oldStyle instanceof FlatContainerStyle && newStyle instanceof FlatContainerStyle) {
+			SiriusStyleCopier.updateSiriusNodeContainerFlatContainerStyle((FlatContainerStyle) oldStyle,
+					(FlatContainerStyle) newStyle);
+		} else if (oldStyle instanceof WorkspaceImage && newStyle instanceof WorkspaceImage) {
+			SiriusStyleCopier.updateSiriusNodeContainerWorkspaceImageStyle((WorkspaceImage) oldStyle,
+					(WorkspaceImage) newStyle);
+		}
+
+		View oldGMFView = SiriusHelper.getGMFView(oldAbstractDNode);
+		View newGMFView = SiriusHelper.getGMFView(newAbstractDNode);
+		updateGMFStyles(oldGMFView, newGMFView);
+	}
+
+	private static void updateGMFStyles(View oldGMFView, View newGMFView) {
+		if (oldGMFView instanceof Node && newGMFView instanceof Node) {
+			Node oldNode = (Node) oldGMFView;
+			Node newNode = (Node) newGMFView;
+			if (oldNode.getLayoutConstraint() instanceof Bounds) {
+				Bounds oldBounds = (Bounds) oldNode.getLayoutConstraint();
+				Bounds newBounds = NotationFactory.eINSTANCE.createBounds();
+				newBounds.setHeight(oldBounds.getHeight());
+				newBounds.setWidth(oldBounds.getWidth());
+				newBounds.setX(oldBounds.getX());
+				newBounds.setY(oldBounds.getY());
+				newNode.setLayoutConstraint(newBounds);
+			}
+			newNode.getStyles().forEach(newStyle -> {
+				Optional<?> oldStyleOpt = oldNode.getStyles().stream()
+						.filter(oldStyle -> oldStyle.getClass().equals(newStyle.getClass())).findFirst();
+
+				oldStyleOpt.ifPresent(oldStyle -> {
+					if (oldStyle instanceof FontStyle && newStyle instanceof FontStyle) {
+						GMFStyleCopier.updateFontStyle((FontStyle) oldStyle, (FontStyle) newStyle);
+					}
+				});
+			});
+			for (Object o : oldNode.getChildren()) {
+				if (o instanceof Node) {
+					Node subOldNode = (Node) o;
+					if (SiriusHelper.LABEL_NODE_TYPE.equals(subOldNode.getType())
+							&& subOldNode.getLayoutConstraint() instanceof Location) {
+						Location oldBounds = (Location) subOldNode.getLayoutConstraint();
+						Location newBounds = NotationFactory.eINSTANCE.createLocation();
+						newBounds.setX(oldBounds.getX());
+						newBounds.setY(oldBounds.getY());
+
+						for (Object o2 : newNode.getChildren()) {
+							if (o2 instanceof Node) {
+								Node subNewNode = (Node) o2;
+								if (SiriusHelper.LABEL_NODE_TYPE.equals(subNewNode.getType())
+										&& subNewNode.getLayoutConstraint() instanceof Location) {
+									subNewNode.setLayoutConstraint(newBounds);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+}
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/ProcessService.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/ProcessService.java
index 6909228c..9325a7e8 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/ProcessService.java
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/ProcessService.java
@@ -21,10 +21,10 @@
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
+import org.eclipse.sirius.diagram.DDiagramElement;
 import org.obeonetwork.dsl.bpmn2.BoundaryEvent;
 import org.obeonetwork.dsl.bpmn2.Bpmn2Factory;
 import org.obeonetwork.dsl.bpmn2.Bpmn2Package;
@@ -99,36 +99,42 @@ protected void copyAttribute(EAttribute eAttribute, EObject eObject, EObject cop
 		}
 	}
 
-	public static void paste(EObject container, EObject containerView, EObject copiedView, EObject copiedElement) {
+	public static void paste(EObject newContainer, DDiagramElement containerView, EObject copiedView,
+			EObject newElement) {
+		String oldId = EcoreUtil.getID(newElement);
+		String newId = EcoreUtil.generateUUID();
+
 		// change IDs
-		EcoreUtil.setID(copiedElement, EcoreUtil.generateUUID());
-		for (Iterator<EObject> iterator = copiedElement.eAllContents(); iterator.hasNext();) {
+		EcoreUtil.setID(newElement, newId);
+		for (Iterator<EObject> iterator = newElement.eAllContents(); iterator.hasNext();) {
 			EcoreUtil.setID(iterator.next(), EcoreUtil.generateUUID());
 		}
 
 		// change Name
-		EStructuralFeature nameFeature = copiedElement.eClass().getEStructuralFeature("name"); //$NON-NLS-1$
+		EStructuralFeature nameFeature = newElement.eClass().getEStructuralFeature("name"); //$NON-NLS-1$
 		if (nameFeature != null) {
-			Object name = copiedElement.eGet(nameFeature);
+			Object name = newElement.eGet(nameFeature);
 			if (name == null) {
 				name = "";
 			}
-			copiedElement.eSet(nameFeature, name + " (copy)"); // $NON-NLS-1$
+			if (!(newElement instanceof SequenceFlow)) {
+				name = name + " (copy)";
+			}
+			newElement.eSet(nameFeature, name); // $NON-NLS-1$
 		}
 
-		// add to container
-		for (EReference containment : container.eClass().getEAllContainments()) {
-			if (containment.getEType().equals(copiedElement.eClass())
-					|| copiedElement.eClass().getEAllSuperTypes().contains(containment.getEType())) {
-				if (containment.isMany()) {
-					@SuppressWarnings("unchecked")
-					EList<EObject> values = ((EList<EObject>) container.eGet(containment));
-					values.add(copiedElement);
-				} else {
-					container.eSet(containment, copiedElement);
-				}
+		// Set reference and containment
+		if (newContainer instanceof Lane) {
+			Lane lane = (Lane) newContainer;
+			if (newElement instanceof FlowNode) {
+				lane.getFlowNodeRefs().add((FlowNode) newElement);
 			}
 		}
+		FlowElementsContainer flowElementsContainer = getFlowElementsContainer(newContainer);
+		flowElementsContainer.getFlowElements().add((FlowElement) newElement);
+
+		// Copy Sirius and GMF styles
+		CopySiriusGMFStylesHelper.copyStyles(newElement, containerView, oldId, newId);
 	}
 
 	public EList<FlowElement> getSubElements(EObject eo) {
@@ -178,7 +184,7 @@ public EObject createFlowElement(EObject container, String typeToCreate) {
 		return newElement;
 	}
 
-	private FlowElementsContainer getFlowElementsContainer(EObject eo) {
+	private static FlowElementsContainer getFlowElementsContainer(EObject eo) {
 		FlowElementsContainer result = null;
 		if (eo instanceof FlowElementsContainer) {
 			result = (FlowElementsContainer) eo;
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/EdgeLayoutData.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/EdgeLayoutData.java
index d04d6f4a..87bc1383 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/EdgeLayoutData.java
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/EdgeLayoutData.java
@@ -12,19 +12,18 @@
 package org.obeonetwork.bpmn2.design.refactoring;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.gmf.runtime.notation.Anchor;
 import org.eclipse.gmf.runtime.notation.Bendpoints;
-import org.eclipse.gmf.runtime.notation.ConnectorStyle;
 import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.FontStyle;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.EdgeStyle;
+import org.obeonetwork.bpmn2.design.util.GMFHelper;
+import org.obeonetwork.bpmn2.design.util.GMFStyleCopier;
+import org.obeonetwork.bpmn2.design.util.SiriusStyleCopier;
 
 /**
  * 
@@ -46,9 +45,8 @@ protected EdgeLayoutData(DEdge siriusSrc, Edge src) {
 		this.oldSiriusStyle = (siriusSrc instanceof DEdge) ? (EdgeStyle) siriusSrc.getStyle() : null;
 		this.oldGMFStyles = src.getStyles();
 
-		labels = ((List<?>) src.getPersistedChildren()).stream()
-				.filter(it -> SiriusElementRefactorHelper.isGmfLabelNode(it)).map(Node.class::cast)
-				.collect(Collectors.toList());
+		labels = ((List<?>) src.getPersistedChildren()).stream().filter(it -> GMFHelper.isGmfLabelNode(it))
+				.map(Node.class::cast).collect(Collectors.toList());
 	}
 
 	/**
@@ -60,48 +58,10 @@ protected void update(DEdge targetSiriusEdge, Edge edge) {
 		edge.setBendpoints(bendPoints);
 		edge.setSourceAnchor(sourceAnchor);
 		edge.setTargetAnchor(targetAnchor);
-		updateEdgeStyle(targetSiriusEdge, edge);
+		SiriusStyleCopier.updateEdgeStyle(targetSiriusEdge, edge, oldSiriusStyle, oldGMFStyles);
 		if (!labels.isEmpty()) {
-			updateLabels(edge);
+			GMFStyleCopier.updateLabels(edge, labels);
 		}
 	}
 
-	@SuppressWarnings("unchecked")
-	private void updateEdgeStyle(DEdge targetSiriusEdge, Edge targetEdge) {
-		if (oldSiriusStyle != null) {
-			SiriusElementRefactorHelper.updateSiriusEdgeStyle(oldSiriusStyle, (EdgeStyle) targetSiriusEdge.getStyle());
-		}
-
-		targetEdge.getStyles().forEach(newStyle -> {
-			Optional<?> oldStyleOpt = oldGMFStyles.stream()
-					.filter(oldStyle -> oldStyle.getClass().equals(newStyle.getClass())).findFirst();
-
-			oldStyleOpt.ifPresent(oldStyle -> {
-				if (oldStyle instanceof FontStyle && newStyle instanceof FontStyle) {
-					SiriusElementRefactorHelper.updateFontStyle((FontStyle) oldStyle, (FontStyle) newStyle);
-				} else if (oldStyle instanceof ConnectorStyle && newStyle instanceof ConnectorStyle) {
-					SiriusElementRefactorHelper.updateConnectorStyle((ConnectorStyle) oldStyle,
-							(ConnectorStyle) newStyle);
-				}
-			});
-		});
-	}
-
-	private void updateLabels(Edge edge) {
-		((List<?>) edge.getPersistedChildren()).stream().filter(it -> SiriusElementRefactorHelper.isGmfLabelNode(it))
-				.map(Node.class::cast).forEach(it -> updateLabel(it));
-
-	}
-
-	private void updateLabel(Node it) {
-		Node old = findLabel(it.getType());
-		if (old != null) {
-			it.setLayoutConstraint(old.getLayoutConstraint());
-		}
-	}
-
-	private Node findLabel(String type) {
-		return labels.stream().filter(it -> Objects.equals(it.getType(), type)).findFirst().orElse(null);
-	}
-
 }
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/EndLayout.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/EndLayout.java
index aa548ed8..8fccdd71 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/EndLayout.java
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/EndLayout.java
@@ -22,6 +22,11 @@
  * @author nperansin
  */
 class EndLayout extends EdgeLayout {
+
+	static EdgeTarget getEnd(DEdge src, boolean out) {
+		return out ? src.getTargetNode() : src.getSourceNode();
+	}
+
 	final boolean targetChange;
 	final EdgeTarget end;
 	final boolean outEnd;
@@ -31,13 +36,13 @@ protected EndLayout(DEdge src, AbstractDNode targeting, boolean out, Session ses
 		super(src, session);
 		targetChange = src.getTarget() == targeting.getTarget();
 		outEnd = out;
-		end = SiriusElementRefactorHelper.getEnd(src, out);
+		end = getEnd(src, out);
 		endChange = end == targeting;
 	}
 
 	protected boolean match(DEdge it, AbstractDNode previous, AbstractDNode current) {
 		EObject expectedTarget = targetChange ? current.getTarget() : target.getTarget();
-		EdgeTarget actualEnd = SiriusElementRefactorHelper.getEnd(it, outEnd);
+		EdgeTarget actualEnd = getEnd(it, outEnd);
 		EdgeTarget expectedEnd = endChange ? (EdgeTarget) current : end;
 
 		return it.getTarget() == expectedTarget // proper target
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/NodeLayout.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/NodeLayout.java
index 24c1ff46..8c86e10b 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/NodeLayout.java
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/NodeLayout.java
@@ -36,6 +36,9 @@
 import org.eclipse.sirius.viewpoint.Style;
 import org.obeonetwork.bpmn2.design.Activator;
 import org.obeonetwork.bpmn2.design.ServiceHelper;
+import org.obeonetwork.bpmn2.design.util.GMFStyleCopier;
+import org.obeonetwork.bpmn2.design.util.SiriusHelper;
+import org.obeonetwork.bpmn2.design.util.SiriusStyleCopier;
 
 /**
  * 
@@ -43,8 +46,6 @@
  */
 class NodeLayout extends RepresentationLayout<AbstractNodeMapping, AbstractDNode> {
 
-	private static final String LABEL_NODE_TYPE = "5003";
-
 	final Bounds bounds;
 	final Location labelLocation;
 	final List<NodeLayout> borders;
@@ -69,7 +70,7 @@ protected NodeLayout(AbstractDNode src, Session session) {
 				for (Object o : node.getChildren()) {
 					if (o instanceof Node) {
 						Node subNode = (Node) o;
-						if (LABEL_NODE_TYPE.equals(subNode.getType())
+						if (SiriusHelper.LABEL_NODE_TYPE.equals(subNode.getType())
 								&& subNode.getLayoutConstraint() instanceof Location) {
 							labelLocation = (Location) subNode.getLayoutConstraint();
 						}
@@ -107,7 +108,7 @@ protected void update(AbstractDNode target) {
 			for (Object o : node.getChildren()) {
 				if (o instanceof Node) {
 					Node subNode = (Node) o;
-					if (LABEL_NODE_TYPE.equals(subNode.getType())) {
+					if (SiriusHelper.LABEL_NODE_TYPE.equals(subNode.getType())) {
 						subNode.setLayoutConstraint(labelLocation);
 					}
 				}
@@ -117,7 +118,7 @@ protected void update(AbstractDNode target) {
 		updateNodeContainerStyle(target, gmfView instanceof Node ? (Node) gmfView : null);
 
 		if (target instanceof DNode && isExternalLabel) {
-			//Crapy code to set that the DNode has an external label.
+			// Crapy code to set that the DNode has an external label.
 			ServiceHelper.setExternalLabelInTooltip((DNode) target);
 		}
 
@@ -134,15 +135,14 @@ protected void update(AbstractDNode target) {
 	private void updateNodeContainerStyle(AbstractDNode target, Node gmfNode) {
 		if (target != null && (target.getStyle() instanceof FlatContainerStyle)
 				&& (siriusStyle instanceof FlatContainerStyle)) {
-			SiriusElementRefactorHelper.updateSiriusNodeContainerFlatContainerStyle((FlatContainerStyle) siriusStyle,
+			SiriusStyleCopier.updateSiriusNodeContainerFlatContainerStyle((FlatContainerStyle) siriusStyle,
 					(FlatContainerStyle) target.getStyle());
 		} else if (target != null && (target.getStyle() instanceof WorkspaceImage)
 				&& (siriusStyle instanceof WorkspaceImage)) {
-			SiriusElementRefactorHelper.updateSiriusNodeContainerWorkspaceImageStyle((WorkspaceImage) siriusStyle,
+			SiriusStyleCopier.updateSiriusNodeContainerWorkspaceImageStyle((WorkspaceImage) siriusStyle,
 					(WorkspaceImage) target.getStyle());
 		} else if (target != null && (target.getStyle() instanceof Square) && (siriusStyle instanceof Square)) {
-			SiriusElementRefactorHelper.updateSiriusNodeContainerSquareStyle((Square) siriusStyle,
-					(Square) target.getStyle());
+			SiriusStyleCopier.updateSiriusNodeContainerSquareStyle((Square) siriusStyle, (Square) target.getStyle());
 		} else {
 			if (target == null || ((DNode) target).getStyle() == null) {
 				Activator.log(IStatus.ERROR, "Target or style is null: " + target.getStyle().getClass().getName() + "/"
@@ -160,7 +160,7 @@ private void updateNodeContainerStyle(AbstractDNode target, Node gmfNode) {
 
 				oldStyleOpt.ifPresent(oldStyle -> {
 					if (oldStyle instanceof FontStyle && newStyle instanceof FontStyle) {
-						SiriusElementRefactorHelper.updateFontStyle((FontStyle) oldStyle, (FontStyle) newStyle);
+						GMFStyleCopier.updateFontStyle((FontStyle) oldStyle, (FontStyle) newStyle);
 					}
 				});
 			});
@@ -184,7 +184,7 @@ protected EndLayout findEdgeLayout(DEdge current, List<EndLayout> layouts, Abstr
 	}
 
 	protected void updateBorder(DNode border) {
-		NodeLayout layout = SiriusElementRefactorHelper.findLayout(borders, border);
+		NodeLayout layout = findLayout(borders, border);
 		if (layout != null) {
 			layout.updateBorderStyle(border);
 		}
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/RepresentationLayout.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/RepresentationLayout.java
index 2f872de8..fef01f05 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/RepresentationLayout.java
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/RepresentationLayout.java
@@ -11,6 +11,8 @@
  */
 package org.obeonetwork.bpmn2.design.refactoring;
 
+import java.util.Collection;
+
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.diagram.DDiagramElement;
@@ -21,6 +23,12 @@
  * @author nperansin
  */
 abstract class RepresentationLayout<M extends DiagramElementMapping, D extends DDiagramElement> {
+	
+	static <T extends RepresentationLayout<?, ?>> T findLayout(Collection<T> layouts, DDiagramElement element) {
+		return layouts.stream().filter(
+				it -> it.target.getTarget() == element.getTarget() && it.mapping == element.getDiagramElementMapping())
+				.findFirst().orElse(null);
+	}
 
 	final Session session;
 
@@ -49,4 +57,6 @@ protected void update() {
 	}
 
 	protected abstract void update(D newView);
+	
+	
 }
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/SiriusElementRefactor.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/SiriusElementRefactor.java
index 90a6cfeb..4ee61d1a 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/SiriusElementRefactor.java
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/SiriusElementRefactor.java
@@ -22,16 +22,12 @@
 import java.util.stream.Stream;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.sirius.business.api.dialect.DialectManager;
-import org.eclipse.sirius.business.api.session.CustomDataConstants;
 import org.eclipse.sirius.business.api.session.Session;
 import org.eclipse.sirius.diagram.AbstractDNode;
 import org.eclipse.sirius.diagram.DDiagram;
@@ -50,16 +46,15 @@
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.IEdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
-import org.eclipse.sirius.diagram.ui.internal.refresh.diagram.DDiagramCanonicalSynchronizer;
 import org.eclipse.sirius.diagram.ui.part.SiriusDiagramEditor;
 import org.eclipse.sirius.ui.business.api.session.SessionEditorInput;
 import org.eclipse.sirius.viewpoint.DRepresentationDescriptor;
 import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
-import org.eclipse.sirius.viewpoint.description.AnnotationEntry;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PlatformUI;
 import org.obeonetwork.bpmn2.design.Activator;
+import org.obeonetwork.bpmn2.design.util.SiriusHelper;
 
 /**
  * Refactor an element into a Sirius Session.
@@ -150,7 +145,7 @@ public <R extends EObject> EObject replaceWith(R target) {
 			edgeLayouts.forEach(it -> toRefresh.add(createNewEdge(target, it)));
 
 			// Refresh Diagrams to create GMF notation
-			toRefresh.forEach(it -> refresh(it));
+			toRefresh.forEach(it -> SiriusHelper.refresh(it));
 
 			// Restore layout nodes
 			nodeLayouts.forEach(it -> it.update());
@@ -208,30 +203,7 @@ private static void updateNodeMapping(AbstractDNode node, AbstractNodeMapping ne
 		// (like for a VSM update)
 	}
 
-	private void refresh(DSemanticDiagram it) {
-		Diagram gmfDiagram = getGMFDiagram(it);
-		if (gmfDiagram == null) {
-			return;
-		}
-		// Create proper location
-		DDiagramCanonicalSynchronizer gmfSynch = new DDiagramCanonicalSynchronizer(gmfDiagram);
-		gmfSynch.storeViewsToArrange(false);
-
-		// Clean diagram and related edges
-		DialectManager.INSTANCE.refresh(it, new NullProgressMonitor());
-
-		// Create gmf nodes of new elements. This is performed in pre-commit.
-		gmfSynch.synchronize();
-	}
 
-	private static Diagram getGMFDiagram(DDiagram it) {
-		for (AnnotationEntry anno : it.getOwnedAnnotationEntries()) {
-			if (Objects.equals(anno.getSource(), CustomDataConstants.GMF_DIAGRAMS)) {
-				return (Diagram) anno.getData();
-			}
-		}
-		return null;
-	}
 
 	private DSemanticDiagram createNewNode(EObject target, NodeLayout save) {
 		DSemanticDiagram diagram = getAncestor(DSemanticDiagram.class, save.container);
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/GMFHelper.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/GMFHelper.java
new file mode 100644
index 00000000..da8a5cf9
--- /dev/null
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/GMFHelper.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2011-2024 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ * 
+ */
+package org.obeonetwork.bpmn2.design.util;
+
+import org.eclipse.gmf.runtime.notation.Node;
+
+public class GMFHelper {
+
+	public static boolean isGmfLabelNode(Object it) {
+		if (!(it instanceof Node)) {
+			return false;
+		}
+		Node node = (Node) it;
+		return node.getPersistedChildren().isEmpty() && node.getType() != null;
+	}
+}
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/GMFStyleCopier.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/GMFStyleCopier.java
new file mode 100644
index 00000000..860a4e21
--- /dev/null
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/GMFStyleCopier.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2011-2024 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ * 
+ */
+package org.obeonetwork.bpmn2.design.util;
+
+import java.util.List;
+import java.util.Objects;
+
+import org.eclipse.gmf.runtime.notation.Bounds;
+import org.eclipse.gmf.runtime.notation.ConnectorStyle;
+import org.eclipse.gmf.runtime.notation.Edge;
+import org.eclipse.gmf.runtime.notation.FontStyle;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationFactory;
+
+public class GMFStyleCopier {
+
+	public static void updateFontStyle(FontStyle oldStyle, FontStyle newStyle) {
+		newStyle.setBold(oldStyle.isBold());
+		newStyle.setFontColor(oldStyle.getFontColor());
+		newStyle.setFontHeight(oldStyle.getFontHeight());
+		newStyle.setFontName(oldStyle.getFontName());
+		newStyle.setItalic(oldStyle.isItalic());
+		newStyle.setStrikeThrough(oldStyle.isStrikeThrough());
+		newStyle.setUnderline(oldStyle.isUnderline());
+	}
+
+	public static void updateConnectorStyle(ConnectorStyle oldStyle, ConnectorStyle newStyle) {
+		newStyle.setAvoidObstructions(oldStyle.isAvoidObstructions());
+		newStyle.setClosestDistance(oldStyle.isClosestDistance());
+		newStyle.setJumpLinksReverse(oldStyle.isJumpLinksReverse());
+		newStyle.setJumpLinkStatus(oldStyle.getJumpLinkStatus());
+		newStyle.setJumpLinkType(oldStyle.getJumpLinkType());
+		newStyle.setLineColor(oldStyle.getLineColor());
+		newStyle.setLineWidth(oldStyle.getLineWidth());
+		newStyle.setRoundedBendpointsRadius(oldStyle.getRoundedBendpointsRadius());
+		newStyle.setRouting(oldStyle.getRouting());
+		newStyle.setSmoothness(oldStyle.getSmoothness());
+	}
+	
+	public static void updateLabels(Edge edge, List<Node> labels) {
+		((List<?>) edge.getPersistedChildren()).stream().filter(it -> GMFHelper.isGmfLabelNode(it))
+				.map(Node.class::cast).forEach(it -> updateLabel(it, labels));
+
+	}
+
+	private static void updateLabel(Node it, List<Node> labels) {
+		Node old = findLabel(it.getType(), labels);
+		if (old != null) {
+			if (old.getLayoutConstraint() instanceof Bounds) {
+				Bounds oldBounds = (Bounds) old.getLayoutConstraint();
+				Bounds newBounds = NotationFactory.eINSTANCE.createBounds();
+				newBounds.setHeight(oldBounds.getHeight());
+				newBounds.setWidth(oldBounds.getWidth());
+				newBounds.setX(oldBounds.getX());
+				newBounds.setY(oldBounds.getY());
+				it.setLayoutConstraint(newBounds);
+			}
+		}
+	}
+
+	private static Node findLabel(String type, List<Node> labels) {
+		return labels.stream().filter(it -> Objects.equals(it.getType(), type)).findFirst().orElse(null);
+	}
+
+}
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/SiriusHelper.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/SiriusHelper.java
new file mode 100644
index 00000000..5c3b6a39
--- /dev/null
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/SiriusHelper.java
@@ -0,0 +1,171 @@
+/**
+ * Copyright (c) 2011-2024 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ * 
+ */
+package org.obeonetwork.bpmn2.design.util;
+
+import java.util.Objects;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.sirius.business.api.dialect.DialectManager;
+import org.eclipse.sirius.business.api.session.CustomDataConstants;
+import org.eclipse.sirius.business.api.session.Session;
+import org.eclipse.sirius.diagram.AbstractDNode;
+import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.DDiagramElement;
+import org.eclipse.sirius.diagram.DEdge;
+import org.eclipse.sirius.diagram.DNodeContainer;
+import org.eclipse.sirius.diagram.DSemanticDiagram;
+import org.eclipse.sirius.diagram.ui.business.api.view.SiriusGMFHelper;
+import org.eclipse.sirius.diagram.ui.internal.refresh.diagram.DDiagramCanonicalSynchronizer;
+import org.eclipse.sirius.diagram.ui.tools.api.editor.DDiagramEditor;
+import org.eclipse.sirius.viewpoint.DRepresentation;
+import org.eclipse.sirius.viewpoint.description.AnnotationEntry;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IWorkbenchPage;
+
+public class SiriusHelper {
+
+	public static final String LABEL_NODE_TYPE = "5003";
+
+	public static AbstractDNode getAbstractDNode(DDiagram diagram, String id) {
+		AbstractDNode result = null;
+		for (DDiagramElement de : diagram.getOwnedDiagramElements()) {
+			if (de instanceof DNodeContainer) {
+				result = getAbstractDNode((DNodeContainer) de, id);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return result;
+	}
+
+	public static AbstractDNode getAbstractDNode(DNodeContainer dNodeContainer, String id) {
+		AbstractDNode result = null;
+		for (DDiagramElement de : dNodeContainer.getOwnedDiagramElements()) {
+			if (de.getTarget() != null && de instanceof AbstractDNode && id.equals(EcoreUtil.getID(de.getTarget()))) {
+				return (AbstractDNode) de;
+			} else if (result == null && de instanceof DNodeContainer) {
+				result = getAbstractDNode((DNodeContainer) de, id);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		for (DDiagramElement de : dNodeContainer.getOwnedBorderedNodes()) {
+			if (de.getTarget() != null && de instanceof AbstractDNode && id.equals(EcoreUtil.getID(de.getTarget()))) {
+				return (AbstractDNode) de;
+			} else if (result == null && de instanceof DNodeContainer) {
+				result = getAbstractDNode((DNodeContainer) de, id);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return result;
+	}
+
+	public static DEdge getDEdge(DDiagram diagram, String id) {
+		DEdge result = null;
+		try {
+			for (DEdge de : diagram.getEdges()) {
+				if (id.equals(EcoreUtil.getID(de.getTarget()))) {
+					return de;
+				}
+			}
+		} catch (Exception e) {
+			// Nada
+		}
+		return result;
+	}
+
+	public static AbstractDNode getAbstractDNode(String id, IWorkbenchPage[] pages) {
+		for (IWorkbenchPage page : pages) {
+			IEditorReference[] editorReferences = page.getEditorReferences();
+			for (IEditorReference editorRef : editorReferences) {
+				try {
+					IEditorPart editor = editorRef.getEditor(false);
+					if (editor instanceof DDiagramEditor) {
+						DDiagramEditor siriusEditor = (DDiagramEditor) editor;
+						DRepresentation dRep = siriusEditor.getRepresentation();
+						if (dRep instanceof DDiagram) {
+							AbstractDNode result = SiriusHelper.getAbstractDNode((DDiagram) dRep, id);
+							if (result != null) {
+								return result;
+							}
+						}
+					}
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return null;
+	}
+
+	public static DEdge getDEdge(String id, IWorkbenchPage[] pages) {
+		for (IWorkbenchPage page : pages) {
+			IEditorReference[] editorReferences = page.getEditorReferences();
+			for (IEditorReference editorRef : editorReferences) {
+				try {
+					IEditorPart editor = editorRef.getEditor(false);
+					if (editor instanceof DDiagramEditor) {
+						DDiagramEditor siriusEditor = (DDiagramEditor) editor;
+						DRepresentation dRep = siriusEditor.getRepresentation();
+						if (dRep instanceof DDiagram) {
+							DEdge result = SiriusHelper.getDEdge((DDiagram) dRep, id);
+							if (result != null) {
+								return result;
+							}
+						}
+					}
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return null;
+	}
+
+	public static void refresh(DSemanticDiagram dSemanticDiagram) {
+		Diagram gmfDiagram = getGMFDiagram(dSemanticDiagram);
+		if (gmfDiagram == null) {
+			return;
+		}
+		// Create proper location
+		DDiagramCanonicalSynchronizer gmfSynch = new DDiagramCanonicalSynchronizer(gmfDiagram);
+		gmfSynch.storeViewsToArrange(false);
+		// Clean diagram and related edges
+		DialectManager.INSTANCE.refresh(dSemanticDiagram, new NullProgressMonitor());
+		// Create gmf nodes of new elements. This is performed in pre-commit.
+		gmfSynch.synchronize();
+	}
+
+	public static Diagram getGMFDiagram(DDiagram dDiagram) {
+		for (AnnotationEntry anno : dDiagram.getOwnedAnnotationEntries()) {
+			if (Objects.equals(anno.getSource(), CustomDataConstants.GMF_DIAGRAMS)) {
+				return (Diagram) anno.getData();
+			}
+		}
+		return null;
+	}
+
+	public static View getGMFView(DDiagramElement dDiagramElement) {
+		Session session = Session.of(dDiagramElement).get();
+		View gmfView = SiriusGMFHelper.getGmfView(dDiagramElement, session);
+		return gmfView;
+	}
+
+}
diff --git a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/SiriusElementRefactorHelper.java b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/SiriusStyleCopier.java
similarity index 67%
rename from plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/SiriusElementRefactorHelper.java
rename to plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/SiriusStyleCopier.java
index 057067b7..78bf7b15 100644
--- a/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/refactoring/SiriusElementRefactorHelper.java
+++ b/plugins/org.obeonetwork.dsl.bpmn2.design/src/org/obeonetwork/bpmn2/design/util/SiriusStyleCopier.java
@@ -9,65 +9,24 @@
  *     Obeo - initial API and implementation
  * 
  */
-package org.obeonetwork.bpmn2.design.refactoring;
+package org.obeonetwork.bpmn2.design.util;
 
-import java.util.Collection;
+import java.util.Optional;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.gmf.runtime.notation.ConnectorStyle;
+import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.DEdge;
 import org.eclipse.sirius.diagram.EdgeStyle;
-import org.eclipse.sirius.diagram.EdgeTarget;
 import org.eclipse.sirius.diagram.FlatContainerStyle;
 import org.eclipse.sirius.diagram.Square;
 import org.eclipse.sirius.diagram.WorkspaceImage;
+import org.eclipse.sirius.diagram.impl.DiagramFactoryImpl;
 
-public class SiriusElementRefactorHelper {
+public class SiriusStyleCopier {
 
-	static boolean isGmfLabelNode(Object it) {
-		if (!(it instanceof Node)) {
-			return false;
-		}
-		Node node = (Node) it;
-		return node.getPersistedChildren().isEmpty() && node.getType() != null;
-	}
-
-	static <T extends RepresentationLayout<?, ?>> T findLayout(Collection<T> layouts, DDiagramElement element) {
-		return layouts.stream().filter(
-				it -> it.target.getTarget() == element.getTarget() && it.mapping == element.getDiagramElementMapping())
-				.findFirst().orElse(null);
-	}
-
-	static EdgeTarget getEnd(DEdge src, boolean out) {
-		return out ? src.getTargetNode() : src.getSourceNode();
-	}
-
-	static void updateFontStyle(FontStyle oldStyle, FontStyle newStyle) {
-		newStyle.setBold(oldStyle.isBold());
-		newStyle.setFontColor(oldStyle.getFontColor());
-		newStyle.setFontHeight(oldStyle.getFontHeight());
-		newStyle.setFontName(oldStyle.getFontName());
-		newStyle.setItalic(oldStyle.isItalic());
-		newStyle.setStrikeThrough(oldStyle.isStrikeThrough());
-		newStyle.setUnderline(oldStyle.isUnderline());
-	}
-
-	static void updateConnectorStyle(ConnectorStyle oldStyle, ConnectorStyle newStyle) {
-		newStyle.setAvoidObstructions(oldStyle.isAvoidObstructions());
-		newStyle.setClosestDistance(oldStyle.isClosestDistance());
-		newStyle.setJumpLinksReverse(oldStyle.isJumpLinksReverse());
-		newStyle.setJumpLinkStatus(oldStyle.getJumpLinkStatus());
-		newStyle.setJumpLinkType(oldStyle.getJumpLinkType());
-		newStyle.setLineColor(oldStyle.getLineColor());
-		newStyle.setLineWidth(oldStyle.getLineWidth());
-		newStyle.setRoundedBendpointsRadius(oldStyle.getRoundedBendpointsRadius());
-		newStyle.setRouting(oldStyle.getRouting());
-		newStyle.setSmoothness(oldStyle.getSmoothness());
-	}
-
-	static void updateSiriusNodeContainerFlatContainerStyle(FlatContainerStyle oldContainerStyle,
+	public static void updateSiriusNodeContainerFlatContainerStyle(FlatContainerStyle oldContainerStyle,
 			FlatContainerStyle containerStyle) {
 		containerStyle.setDescription(oldContainerStyle.getDescription());
 		containerStyle.setUid(oldContainerStyle.getUid());
@@ -89,12 +48,12 @@ static void updateSiriusNodeContainerFlatContainerStyle(FlatContainerStyle oldCo
 		containerStyle.setShowIcon(oldContainerStyle.isShowIcon());
 	}
 
-	static void updateSiriusEdgeStyle(EdgeStyle siriusStyle, EdgeStyle newSiriusStyle) {
-		newSiriusStyle.setBeginLabelStyle(siriusStyle.getBeginLabelStyle());
+	public static void updateSiriusEdgeStyle(EdgeStyle siriusStyle, EdgeStyle newSiriusStyle) {
+		//newSiriusStyle.setBeginLabelStyle(siriusStyle.getBeginLabelStyle());
 		newSiriusStyle.setCentered(siriusStyle.getCentered());
-		newSiriusStyle.setCenterLabelStyle(siriusStyle.getCenterLabelStyle());
+		updateSiriusCenterLabelStyle(siriusStyle, newSiriusStyle);
 		newSiriusStyle.setDescription(siriusStyle.getDescription());
-		newSiriusStyle.setEndLabelStyle(siriusStyle.getEndLabelStyle());
+		//newSiriusStyle.setEndLabelStyle(siriusStyle.getEndLabelStyle());
 		newSiriusStyle.setFoldingStyle(siriusStyle.getFoldingStyle());
 		newSiriusStyle.setLineStyle(siriusStyle.getLineStyle());
 		newSiriusStyle.setRoutingStyle(siriusStyle.getRoutingStyle());
@@ -107,6 +66,23 @@ static void updateSiriusEdgeStyle(EdgeStyle siriusStyle, EdgeStyle newSiriusStyl
 		newSiriusStyle.getCustomFeatures().addAll(siriusStyle.getCustomFeatures());
 	}
 
+	private static void updateSiriusCenterLabelStyle(EdgeStyle siriusStyle, EdgeStyle newSiriusStyle) {
+		if (newSiriusStyle.getCenterLabelStyle() == null && siriusStyle.getCenterLabelStyle() != null) {
+			newSiriusStyle.setCenterLabelStyle(DiagramFactoryImpl.eINSTANCE.createCenterLabelStyle());
+		}
+		if (newSiriusStyle.getCenterLabelStyle() != null && siriusStyle.getCenterLabelStyle() != null) {
+			newSiriusStyle.getCenterLabelStyle().setDescription(siriusStyle.getCenterLabelStyle().getDescription());
+			newSiriusStyle.getCenterLabelStyle().setIconPath(siriusStyle.getCenterLabelStyle().getIconPath());
+			newSiriusStyle.getCenterLabelStyle().setLabelColor(siriusStyle.getCenterLabelStyle().getLabelColor());
+			newSiriusStyle.getCenterLabelStyle().setLabelSize(siriusStyle.getCenterLabelStyle().getLabelSize());
+			newSiriusStyle.getCenterLabelStyle().setShowIcon(siriusStyle.getCenterLabelStyle().isShowIcon());
+			newSiriusStyle.getCenterLabelStyle().getCustomFeatures()
+					.addAll(siriusStyle.getCenterLabelStyle().getCustomFeatures());
+		}
+	}
+	
+	
+
 	public static void updateSiriusNodeContainerWorkspaceImageStyle(WorkspaceImage oldContainerStyle,
 			WorkspaceImage containerStyle) {
 		containerStyle.setDescription(oldContainerStyle.getDescription());
@@ -147,5 +123,28 @@ public static void updateSiriusNodeContainerSquareStyle(Square oldContainerStyle
 		containerStyle.setShowIcon(oldContainerStyle.isShowIcon());
 		containerStyle.setWidth(oldContainerStyle.getWidth());
 	}
+	
+	@SuppressWarnings("unchecked")
+	public static void updateEdgeStyle(DEdge targetSiriusEdge, Edge targetEdge, EdgeStyle oldSiriusStyle,
+			EList<?> oldGMFStyles) {
+		if (oldSiriusStyle != null) {
+			SiriusStyleCopier.updateSiriusEdgeStyle(oldSiriusStyle, (EdgeStyle) targetSiriusEdge.getStyle());
+		}
+
+		targetEdge.getStyles().forEach(newStyle -> {
+			Optional<?> oldStyleOpt = oldGMFStyles.stream()
+					.filter(oldStyle -> oldStyle.getClass().equals(newStyle.getClass())).findFirst();
+
+			oldStyleOpt.ifPresent(oldStyle -> {
+				if (oldStyle instanceof FontStyle && newStyle instanceof FontStyle) {
+					GMFStyleCopier.updateFontStyle((FontStyle) oldStyle, (FontStyle) newStyle);
+				} else if (oldStyle instanceof ConnectorStyle && newStyle instanceof ConnectorStyle) {
+					GMFStyleCopier.updateConnectorStyle((ConnectorStyle) oldStyle, (ConnectorStyle) newStyle);
+				}
+			});
+		});
+	}
+
+
 
 }