diff --git a/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign b/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign
index f21b2d19c..52e5caf3e 100644
--- a/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign
+++ b/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign
@@ -316,19 +316,6 @@
           </subSections>
         </subSections>
         <subSections name="profiles">
-          <ownedTools xsi:type="tool_1:DeleteElementDescription" name="DEL_Profilable Element">
-            <element name="element"/>
-            <elementView name="elementView"/>
-            <containerView name="containerView"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:element.unApplyAllStereotypes">
-                <subModelOperations xsi:type="tool:For" expression="service:element.getAllAssociations">
-                  <subModelOperations xsi:type="tool:RemoveElement"/>
-                </subModelOperations>
-                <subModelOperations xsi:type="tool:RemoveElement"/>
-              </firstModelOperations>
-            </initialOperation>
-          </ownedTools>
           <ownedTools xsi:type="tool:PaneBasedSelectionWizardDescription" name="Stereotype" iconPath="/org.eclipse.uml2.uml.edit/icons/full/obj16/Stereotype.gif" windowTitle="Select stereotypes to apply" message="Select stereotypes to apply" choiceOfValuesMessage="Applicable stereotypes" candidatesExpression="service:self.getAllStereotypesAndProfiles" tree="true" rootExpression="service:self.getAllProfilesInPlatform" childrenExpression="feature:ownedStereotype" selectedValuesMessage="Stereotypes to apply" preSelectedCandidatesExpression="[self.oclAsType(uml::Element).getAppliedStereotypes()/]">
             <element name="stereotype"/>
             <containerView name="containerView"/>
@@ -558,7 +545,7 @@
       </filters>
       <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="[self.eContents()->filter(uml::Package)/]" nodeMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']"/>
       <defaultLayer name="Package Hierarchy" reusedMappings="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@defaultLayer/@nodeMappings[name='Empty%20Diagram']">
-        <nodeMappings name="PH_Package" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Sequence%20diagram']/@ownedTools[name='Create%20sequence%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Create%20activity%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Deployment%20diagram']/@ownedTools[name='Create%20deployment%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Component%20diagram']/@ownedTools[name='Create%20component%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Class%20diagram']/@ownedTools[name='Create%20class%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Use%20case%20diagram']/@ownedTools[name='Create%20Use%20Case%20Diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Create%20statemachine%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Package%20Hierarchy%20diagram']/@ownedTools[name='Create%20package%20hierarchy%20diagram']" navigationDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Open%20activity%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Open%20statemachine%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Sequence%20diagram']/@ownedTools[name='Open%20sequence%20diagram%20from%20package']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='DEL_Package']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Package">
+        <nodeMappings name="PH_Package" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Sequence%20diagram']/@ownedTools[name='Create%20sequence%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Create%20activity%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Deployment%20diagram']/@ownedTools[name='Create%20deployment%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Component%20diagram']/@ownedTools[name='Create%20component%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Class%20diagram']/@ownedTools[name='Create%20class%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Use%20case%20diagram']/@ownedTools[name='Create%20Use%20Case%20Diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Create%20statemachine%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Package%20Hierarchy%20diagram']/@ownedTools[name='Create%20package%20hierarchy%20diagram']" navigationDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Open%20activity%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Open%20statemachine%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Sequence%20diagram']/@ownedTools[name='Open%20sequence%20diagram%20from%20package']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Package">
           <style xsi:type="style:WorkspaceImageDescription" showIcon="false" sizeComputationExpression="8" labelPosition="node" resizeKind="NSEW" workspacePath="/org.obeonetwork.dsl.uml2.design/images/package.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -572,7 +559,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="PH_Import" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20an%20import%2Fmerge%20edge']" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" sourceMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetFinderExpression="feature:importedPackage" sourceFinderExpression="feature:importingNamespace" domainClass="uml.PackageImport" useDomainElement="true" reconnections="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20package%20import%20target'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20package%20import%20source']">
+        <edgeMappings name="PH_Import" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" sourceMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetFinderExpression="feature:importedPackage" sourceFinderExpression="feature:importingNamespace" domainClass="uml.PackageImport" useDomainElement="true" reconnections="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20package%20import%20target'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20package%20import%20source']">
           <style lineStyle="dash" sizeComputationExpression="1">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription showIcon="false" labelExpression="&lt;&lt;import>>">
@@ -604,7 +591,7 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="PH_Merge" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20an%20import%2Fmerge%20edge']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" sourceMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetFinderExpression="feature:target" sourceFinderExpression="feature:source" domainClass="uml.PackageMerge" useDomainElement="true" reconnections="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20package%20merge%20source'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20package%20merge%20target']">
+        <edgeMappings name="PH_Merge" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" sourceMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetFinderExpression="feature:target" sourceFinderExpression="feature:source" domainClass="uml.PackageMerge" useDomainElement="true" reconnections="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20package%20merge%20source'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20package%20merge%20target']">
           <style lineStyle="dash" sizeComputationExpression="1">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription showIcon="false" labelExpression="&lt;&lt;merge>>">
@@ -638,14 +625,6 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:DeleteElementDescription" name="DEL_Package">
-            <element name="element"/>
-            <elementView name="elementView"/>
-            <containerView name="containerView"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="[element.eContainer(uml::Model).deletePackage(element.oclAsType(uml::Package))/]"/>
-            </initialOperation>
-          </ownedTools>
         </toolSections>
         <toolSections name="Relationships">
           <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="Reconnect package containment source" precondition="service:reconnectContainmentPrecondition(source,target,element)" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE">
@@ -832,16 +811,6 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:DeleteElementDescription" name="Delete an import/merge edge">
-            <element name="element"/>
-            <elementView name="view"/>
-            <containerView name="containerView"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool:RemoveElement"/>
-              </firstModelOperations>
-            </initialOperation>
-          </ownedTools>
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Profiles">
@@ -876,7 +845,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="UCD_Extend" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='delete']/@ownedTools[name='Extends']" semanticCandidatesExpression="service:diagram.getExtendInverseRefs" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" documentation="Mapping to create Extends" sourceMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_UseCase']" targetFinderExpression="feature:extendedCase" sourceFinderExpression="feature:extension" targetExpression="var:self" domainClass="uml.Extend" useDomainElement="true" reconnections="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='reconnect']/@ownedTools[name='UCD_ReconnectExtendSource'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='reconnect']/@ownedTools[name='UCD_ReconnectExtendTarget']" pathExpression="">
+        <edgeMappings name="UCD_Extend" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" semanticCandidatesExpression="service:diagram.getExtendInverseRefs" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" documentation="Mapping to create Extends" sourceMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_UseCase']" targetFinderExpression="feature:extendedCase" sourceFinderExpression="feature:extension" targetExpression="var:self" domainClass="uml.Extend" useDomainElement="true" reconnections="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='reconnect']/@ownedTools[name='UCD_ReconnectExtendSource'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='reconnect']/@ownedTools[name='UCD_ReconnectExtendTarget']" pathExpression="">
           <style lineStyle="dash" sizeComputationExpression="1">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="&#xab; extend &#xbb;">
@@ -884,7 +853,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="UCD_Include" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='delete']/@ownedTools[name='Include']" semanticCandidatesExpression="service:diagram.getIncludeInverseRefs" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" documentation="Mapping to create includes" sourceMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_UseCase']" targetFinderExpression="feature:addition" sourceFinderExpression="feature:includingCase" targetExpression="var:self" domainClass="uml.Include" useDomainElement="true" reconnections="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='reconnect']/@ownedTools[name='UCD_ReconnectIncludeSource'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='reconnect']/@ownedTools[name='UCD_ReconnectIncludeTarget']">
+        <edgeMappings name="UCD_Include" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" semanticCandidatesExpression="service:diagram.getIncludeInverseRefs" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" documentation="Mapping to create includes" sourceMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_UseCase']" targetFinderExpression="feature:addition" sourceFinderExpression="feature:includingCase" targetExpression="var:self" domainClass="uml.Include" useDomainElement="true" reconnections="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='reconnect']/@ownedTools[name='UCD_ReconnectIncludeSource'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='reconnect']/@ownedTools[name='UCD_ReconnectIncludeTarget']">
           <style lineStyle="dash" sizeComputationExpression="1">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="&#xab; include &#xbb;">
@@ -1039,28 +1008,6 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <subSections name="delete">
-            <ownedTools xsi:type="tool_1:DeleteElementDescription" name="Include">
-              <element name="element"/>
-              <elementView name="elementView"/>
-              <containerView name="containerView"/>
-              <initialOperation>
-                <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
-                  <subModelOperations xsi:type="tool:RemoveElement"/>
-                </firstModelOperations>
-              </initialOperation>
-            </ownedTools>
-            <ownedTools xsi:type="tool_1:DeleteElementDescription" name="Extends">
-              <element name="element"/>
-              <elementView name="elementView"/>
-              <containerView name="containerView"/>
-              <initialOperation>
-                <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
-                  <subModelOperations xsi:type="tool:RemoveElement"/>
-                </firstModelOperations>
-              </initialOperation>
-            </ownedTools>
-          </subSections>
           <subSections name="reconnect">
             <ownedTools xsi:type="tool_1:ReconnectEdgeDescription" name="UCD_ReconnectAssociationSource" reconnectionKind="RECONNECT_SOURCE">
               <source name="source"/>
@@ -1390,7 +1337,7 @@
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
         </containerMappings>
-        <containerMappings name="CD_Class" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Create%20activity%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Create%20statemachine%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Class%20diagram']/@ownedTools[name='Create%20class%20diagram%20from%20component']" navigationDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Sequence%20diagram']/@ownedTools[name='Open%20sequence%20diagram%20from%20class'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Open%20activity%20diagram%20from%20classifier'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Open%20statemachine%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Class%20diagram']/@ownedTools[name='Open%20a%20class%20diagram%20from%20component']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='profiles']/@ownedTools[name='DEL_Profilable%20Element']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Class" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Drop%20Attributes%20or%20Operations']" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
+        <containerMappings name="CD_Class" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Create%20activity%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Create%20statemachine%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Class%20diagram']/@ownedTools[name='Create%20class%20diagram%20from%20component']" navigationDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Sequence%20diagram']/@ownedTools[name='Open%20sequence%20diagram%20from%20class'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Open%20activity%20diagram%20from%20classifier'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Open%20statemachine%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Class%20diagram']/@ownedTools[name='Open%20a%20class%20diagram%20from%20component']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Class" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Drop%20Attributes%20or%20Operations']" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="5" arcHeight="5" labelSize="9" labelFormat="bold" labelExpression="service:computeUmlLabel" roundedCorner="true" widthComputationExpression="service:defaultWidth" heightComputationExpression="service:defaultHeight" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='UMLPalette']/@entries[name='lighter%20blue']">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -1404,7 +1351,7 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="CD_Interface" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='profiles']/@ownedTools[name='DEL_Profilable%20Element']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Interface" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Drop%20Attributes%20or%20Operations']" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
+        <containerMappings name="CD_Interface" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Interface" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Drop%20Attributes%20or%20Operations']" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="5" arcHeight="5" borderSizeComputationExpression="1" labelSize="9" labelFormat="bold" labelExpression="service:computeUmlLabel" roundedCorner="true" widthComputationExpression="service:defaultWidth" heightComputationExpression="service:defaultHeight" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='UMLPalette']/@entries[name='lighter%20purple']">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -1418,7 +1365,7 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="CD_DataType" preconditionExpression="[self.oclIsTypeOf(uml::DataType)/]" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='profiles']/@ownedTools[name='DEL_Profilable%20Element']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" domainClass="uml.DataType" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
+        <containerMappings name="CD_DataType" preconditionExpression="[self.oclIsTypeOf(uml::DataType)/]" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" domainClass="uml.DataType" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="5" arcHeight="5" borderSizeComputationExpression="1" labelSize="9" labelFormat="bold" labelExpression="service:computeUmlLabel" roundedCorner="true" widthComputationExpression="service:defaultWidth" heightComputationExpression="service:defaultHeight" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='UMLPalette']/@entries[name='lighter%20green']">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -1432,7 +1379,7 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="CD_PrimitiveType" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='profiles']/@ownedTools[name='DEL_Profilable%20Element']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" domainClass="uml.PrimitiveType" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
+        <containerMappings name="CD_PrimitiveType" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" domainClass="uml.PrimitiveType" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="5" arcHeight="5" borderSizeComputationExpression="1" labelSize="9" labelFormat="bold" labelExpression="service:computeUmlLabel" roundedCorner="true" widthComputationExpression="service:defaultWidth" heightComputationExpression="service:defaultHeight" backgroundStyle="Liquid">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -1448,7 +1395,7 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="CD_Enumeration" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='profiles']/@ownedTools[name='DEL_Profilable%20Element']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Enumeration" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
+        <containerMappings name="CD_Enumeration" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Enumeration" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
           <subNodeMappings name="CD_EnumerationLiteral" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" semanticCandidatesExpression="feature:ownedLiteral" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.EnumerationLiteral">
             <style xsi:type="style:SquareDescription" labelExpression="service:computeUmlLabel" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
@@ -1471,7 +1418,7 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="CD_Package" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Create%20activity%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Deployment%20diagram']/@ownedTools[name='Create%20deployment%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Component%20diagram']/@ownedTools[name='Create%20component%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Class%20diagram']/@ownedTools[name='Create%20class%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Use%20case%20diagram']/@ownedTools[name='Create%20Use%20Case%20Diagram%20from%20package']" pasteDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='profiles']/@ownedTools[name='DEL_Profilable%20Element']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Package" dropDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Enumeration'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Interface'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_PrimitiveType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_DataType']">
+        <containerMappings name="CD_Package" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Create%20activity%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Deployment%20diagram']/@ownedTools[name='Create%20deployment%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Component%20diagram']/@ownedTools[name='Create%20component%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Class%20diagram']/@ownedTools[name='Create%20class%20diagram%20from%20package'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Use%20case%20diagram']/@ownedTools[name='Create%20Use%20Case%20Diagram%20from%20package']" pasteDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Package" dropDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Enumeration'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Interface'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_PrimitiveType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_DataType']">
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="5" arcHeight="5" labelSize="9" labelFormat="bold" labelExpression="service:computeUmlLabel" labelAlignment="LEFT" roundedCorner="true" widthComputationExpression="service:defaultWidth" heightComputationExpression="service:defaultHeight" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='UMLPalette']/@entries[name='Containment%20Background']">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -1487,7 +1434,7 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="CD_AssociationClass" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Create%20activity%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Create%20statemachine%20diagram']" navigationDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Sequence%20diagram']/@ownedTools[name='Open%20sequence%20diagram%20from%20class'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Open%20activity%20diagram%20from%20classifier'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Open%20statemachine%20diagram']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='profiles']/@ownedTools[name='DEL_Profilable%20Element']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" semanticElements="service:getSemanticElements" domainClass="uml.AssociationClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Drop%20Attributes%20or%20Operations']" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
+        <containerMappings name="CD_AssociationClass" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Create%20activity%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Create%20statemachine%20diagram']" navigationDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Sequence%20diagram']/@ownedTools[name='Open%20sequence%20diagram%20from%20class'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Open%20activity%20diagram%20from%20classifier'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Open%20statemachine%20diagram']" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" semanticElements="service:getSemanticElements" domainClass="uml.AssociationClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Drop%20Attributes%20or%20Operations']" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Property'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_ReusedMappingForFeatures']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="5" arcHeight="5" labelSize="9" labelFormat="bold" labelExpression="service:computeUmlLabel" roundedCorner="true" widthComputationExpression="service:defaultWidth" heightComputationExpression="service:defaultHeight" backgroundStyle="Liquid" foregroundColor="//@userColorsPalettes[name='UMLPalette']/@entries[name='lighter%20blue']">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -2504,7 +2451,7 @@
         <toolSections name="Comments" reusedTools="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='comments']/@ownedTools[name='CRE_Comment'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='comments']/@ownedTools[name='CRE_CommentLink']"/>
       </additionalLayers>
       <additionalLayers name="Interfaces">
-        <nodeMappings name="CS_ProvidedInterface" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@toolSections.3/@ownedTools[name='CO_Delete%20Interface%20View']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" domainClass="uml.Interface">
+        <nodeMappings name="CS_ProvidedInterface" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" domainClass="uml.Interface">
           <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2" shape="dot">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -2518,7 +2465,7 @@
             </style>
           </conditionnalStyles>
         </nodeMappings>
-        <nodeMappings name="CS_RequiredInterface" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@toolSections.3/@ownedTools[name='CO_Delete%20Interface%20View']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" domainClass="uml.Interface">
+        <nodeMappings name="CS_RequiredInterface" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" domainClass="uml.Interface">
           <style xsi:type="style:CustomStyleDescription" showIcon="false" id="org.obeonetwork.dsl.uml2.design.ui.extension.rotableNode.requiredInterface">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -2566,7 +2513,7 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@edgeMappings[name='CO_C_Port2SubProvidedInterface'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@edgeMappings[name='CO_C_Port2SubRequiredInterface'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@edgeMappings[name='CO_C_ProvidedInterface2RequiredInterface'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@edgeMappings[name='CO_C_RequiredInterface2ProvidedInterface'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@edgeMappings[name='CO_C_SubProvidedInterface2Port'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@edgeMappings[name='CO_C_SubRequiredInterface2Port']"/>
       </filters>
       <defaultLayer name="Component diagram" reusedMappings="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@defaultLayer/@nodeMappings[name='Empty%20Diagram']" reusedTools="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements']">
-        <nodeMappings name="CO_ProvidedInterface" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@toolSections.3/@ownedTools[name='CO_Delete%20Interface%20View']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Interface">
+        <nodeMappings name="CO_ProvidedInterface" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Interface">
           <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2" shape="dot">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -2580,7 +2527,7 @@
             </style>
           </conditionnalStyles>
         </nodeMappings>
-        <nodeMappings name="CO_RequiredInterface" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@toolSections.3/@ownedTools[name='CO_Delete%20Interface%20View']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Interface">
+        <nodeMappings name="CO_RequiredInterface" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Interface">
           <style xsi:type="style:CustomStyleDescription" showIcon="false" resizeKind="NSEW" id="org.obeonetwork.dsl.uml2.design.ui.extension.rotableNode.requiredInterface">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -2597,7 +2544,7 @@
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="CO_U_ComponentOrPort2Interface" label="CO_U_ComponentOrPort2Interface Never used exepted for edge creation tool" preconditionExpression="service:inactive" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" semanticCandidatesExpression="service:diagram.getUsageInverseRefs" semanticElements="service:getSemanticElements" documentation="This edge mapping has been added to handle a bidirectional edge creation tool." sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_RequiredInterface']" targetFinderExpression="feature:supplier" sourceFinderExpression="service:getClient" domainClass="uml.Usage" useDomainElement="true">
+        <edgeMappings name="CO_U_ComponentOrPort2Interface" label="CO_U_ComponentOrPort2Interface Never used exepted for edge creation tool" preconditionExpression="service:inactive" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" semanticCandidatesExpression="service:diagram.getUsageInverseRefs" semanticElements="service:getSemanticElements" documentation="This edge mapping has been added to handle a bidirectional edge creation tool." sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_RequiredInterface']" targetFinderExpression="feature:supplier" sourceFinderExpression="service:getClient" domainClass="uml.Usage" useDomainElement="true">
           <style targetArrow="NoDecoration" sizeComputationExpression="1">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
@@ -2607,7 +2554,7 @@
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="CO_IR_Interface2ComponentOrPort" label="CO_IR_Interface2ComponentOrPort Never used exepted for edge creation tool" preconditionExpression="service:inactive" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" semanticCandidatesExpression="service:diagram.getInterfaceRealizationInverseRefs" semanticElements="service:getSemanticElements" synchronizationLock="true" documentation="This edge mapping has been added to handle a bidirectional edge create tool." sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_ProvidedInterface']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']" targetFinderExpression="service:getClient" sourceFinderExpression="feature:supplier" domainClass="uml.InterfaceRealization" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20Realization%20source'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20Realization%20target']">
+        <edgeMappings name="CO_IR_Interface2ComponentOrPort" label="CO_IR_Interface2ComponentOrPort Never used exepted for edge creation tool" preconditionExpression="service:inactive" semanticCandidatesExpression="service:diagram.getInterfaceRealizationInverseRefs" semanticElements="service:getSemanticElements" synchronizationLock="true" documentation="This edge mapping has been added to handle a bidirectional edge create tool." sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_ProvidedInterface']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']" targetFinderExpression="service:getClient" sourceFinderExpression="feature:supplier" domainClass="uml.InterfaceRealization" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20Realization%20source'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Reconnect%20Realization%20target']">
           <style targetArrow="NoDecoration" sizeComputationExpression="1">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
@@ -2633,7 +2580,7 @@
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="CO_C_RequiredInterface2ProvidedInterface" label="CO_C_RequiredInterface2ProvidedInterface Never used exepted for edge creation tool" preconditionExpression="service:inactive" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" semanticCandidatesExpression="service:diagram.getConnectorInverseRefs" semanticElements="service:getSemanticElements" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_RequiredInterface']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_ProvidedInterface']" targetFinderExpression="service:getSource4ProvidedInterface2RequiredInterface" sourceFinderExpression="service:getTarget4ProvidedInterface2RequiredInterface" targetExpression="var:self" domainClass="uml.Connector" useDomainElement="true">
+        <edgeMappings name="CO_C_RequiredInterface2ProvidedInterface" label="CO_C_RequiredInterface2ProvidedInterface Never used exepted for edge creation tool" preconditionExpression="service:inactive" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" semanticCandidatesExpression="service:diagram.getConnectorInverseRefs" semanticElements="service:getSemanticElements" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_RequiredInterface']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_ProvidedInterface']" targetFinderExpression="service:getSource4ProvidedInterface2RequiredInterface" sourceFinderExpression="service:getTarget4ProvidedInterface2RequiredInterface" targetExpression="var:self" domainClass="uml.Connector" useDomainElement="true">
           <style targetArrow="NoDecoration" sizeComputationExpression="1">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
           </style>
@@ -2643,7 +2590,7 @@
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="CO_C_Port2SubProvidedInterface" label="CO_C_Port2SubProvidedInterface Never used exepted for edge creation tool" preconditionExpression="service:inactive" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" semanticCandidatesExpression="service:diagram.getConnectorInverseRefs" semanticElements="service:getSemanticElements" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_ProvidedInterface']" targetFinderExpression="service:getSource4SubProvidedInterface2Port" sourceFinderExpression="service:getTarget4SubProvidedInterface2Port" targetExpression="var:self" domainClass="uml.Connector" useDomainElement="true">
+        <edgeMappings name="CO_C_Port2SubProvidedInterface" label="CO_C_Port2SubProvidedInterface Never used exepted for edge creation tool" preconditionExpression="service:inactive" semanticCandidatesExpression="service:diagram.getConnectorInverseRefs" semanticElements="service:getSemanticElements" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_ProvidedInterface']" targetFinderExpression="service:getSource4SubProvidedInterface2Port" sourceFinderExpression="service:getTarget4SubProvidedInterface2Port" targetExpression="var:self" domainClass="uml.Connector" useDomainElement="true">
           <style targetArrow="NoDecoration" sizeComputationExpression="1">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
           </style>
@@ -2653,7 +2600,7 @@
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="CO_C_SubRequiredInterface2Port" label="CO_C_SubRequiredInterface2Port Never used exepted for edge creation tool" preconditionExpression="service:inactive" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" semanticCandidatesExpression="service:diagram.getConnectorInverseRefs" semanticElements="service:getSemanticElements" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_RequiredInterface']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetFinderExpression="service:getSource4Port2SubRequiredInterface" sourceFinderExpression="service:getTarget4Port2SubRequiredInterface" targetExpression="var:self" domainClass="uml.Connector" useDomainElement="true">
+        <edgeMappings name="CO_C_SubRequiredInterface2Port" label="CO_C_SubRequiredInterface2Port Never used exepted for edge creation tool" preconditionExpression="service:inactive" semanticCandidatesExpression="service:diagram.getConnectorInverseRefs" semanticElements="service:getSemanticElements" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_RequiredInterface']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetFinderExpression="service:getSource4Port2SubRequiredInterface" sourceFinderExpression="service:getTarget4Port2SubRequiredInterface" targetExpression="var:self" domainClass="uml.Connector" useDomainElement="true">
           <style targetArrow="NoDecoration" sizeComputationExpression="1">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
           </style>
@@ -2683,7 +2630,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="CO_Component" detailDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Create%20activity%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Composite%20structure%20diagram']/@ownedTools[name='Create%20Composite%20Structure%20Diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Create%20statemachine%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Use%20case%20diagram']/@ownedTools[name='Create%20Use%20Case%20Diagram%20from%20component'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Class%20diagram']/@ownedTools[name='Create%20class%20diagram%20from%20component']" navigationDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Activity%20diagram']/@ownedTools[name='Open%20activity%20diagram%20from%20classifier'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='State%20Machine%20diagram']/@ownedTools[name='Open%20statemachine%20diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='navigations']/@subSections[name='Class%20diagram']/@ownedTools[name='Open%20a%20class%20diagram%20from%20component']" pasteDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste']" preconditionExpression="[self.oclIsTypeOf(uml::Component) or self.oclIsTypeOf(uml::Class)/]" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" createElements="false" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Class" dropDescriptions="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView']" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_ProvidedInterface'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_RequiredInterface']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']">
-          <borderedNodeMappings name="CO_Port" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" semanticCandidatesExpression="[self.oclAsType(uml::StructuredClassifier).ownedAttribute->filter(uml::Port)->select(elt | elt.type &lt;> self)/]" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Port">
+          <borderedNodeMappings name="CO_Port" deletionDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='DEL_DeleteFromModel']" labelDirectEdit="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='directEdit']/@ownedTools[name='NamedElementServiceDirectEdit']" semanticCandidatesExpression="[self.oclAsType(uml::StructuredClassifier).ownedAttribute->filter(uml::Port)->select(elt | elt.type &lt;> self)/]" semanticElements="service:getSemanticElements" doubleClickDescription="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='properties']/@ownedTools[name='Open%20properties%20wizard']" domainClass="uml.Port">
             <style xsi:type="style:BundledImageDescription" labelFormat="italic" showIcon="false" sizeComputationExpression="2" resizeKind="EAST_WEST">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -3048,16 +2995,6 @@
           </ownedTools>
         </toolSections>
         <toolSections name="delete" reusedTools="//@ownedViewpoints[name='Capture']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='EAnnotation']">
-          <ownedTools xsi:type="tool_1:DeleteElementDescription" name="CO_Delete Interface View">
-            <element name="element"/>
-            <elementView name="elementView"/>
-            <containerView name="containerView"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool:RemoveElement"/>
-              </firstModelOperations>
-            </initialOperation>
-          </ownedTools>
           <ownedTools xsi:type="tool_1:DeleteElementDescription" name="CO_Delete Redefined">
             <element name="element"/>
             <elementView name="elementView"/>
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/src/org/obeonetwork/dsl/uml2/design/api/utils/UmlUtils.java b/plugins/org.obeonetwork.dsl.uml2.design/src/org/obeonetwork/dsl/uml2/design/api/utils/UmlUtils.java
index 22099a5fe..fb2b9f9c0 100644
--- a/plugins/org.obeonetwork.dsl.uml2.design/src/org/obeonetwork/dsl/uml2/design/api/utils/UmlUtils.java
+++ b/plugins/org.obeonetwork.dsl.uml2.design/src/org/obeonetwork/dsl/uml2/design/api/utils/UmlUtils.java
@@ -23,7 +23,10 @@
 import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.uml2.common.util.UML2Util;
+import org.eclipse.uml2.uml.AssociationClass;
 import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Relationship;
 import org.eclipse.uml2.uml.Type;
 import org.eclipse.uml2.uml.internal.operations.ElementOperations;
 import org.obeonetwork.dsl.uml2.design.internal.services.ElementServices;
@@ -137,6 +140,12 @@ private void removeReferences(EObject eObject, EObject ancestorEObject) {
 					&& (ancestorEObject == null || !EcoreUtil.isAncestor(ancestorEObject,
 							inverseReference.getEObject()))) {
 				EcoreUtil.remove(inverseReference, eObject);
+				if (inverseReference.getEObject() instanceof Relationship) {
+					destroy(inverseReference.getEObject());
+				} else if (inverseReference.getEObject() instanceof Property
+						&& inverseReference.getEObject().eContainer() instanceof AssociationClass) {
+					destroy(inverseReference.getEObject().eContainer());
+				}
 			}
 		}
 
diff --git a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/Contexts/ContextForAssociationClassDeletionInClassDiagram.ctx b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/Contexts/ContextForAssociationClassDeletionInClassDiagram.ctx
new file mode 100644
index 000000000..6fc2cc4e4
--- /dev/null
+++ b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/Contexts/ContextForAssociationClassDeletionInClassDiagram.ctx
@@ -0,0 +1,102 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.ecl
+Element-Name: ContextForAssociationClassDeletionInClassDiagram
+Element-Type: context
+Element-Version: 2.0
+Id: _H8jl8PM6EeSJppkJ7ssP0Q
+Runtime-Version: 1.5.5.201503020312
+Save-Time: 5/5/15 5:20 PM
+
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
+Content-Type: text/ecl
+Entry-Name: .ecl.context
+
+// Context for association class
+with [get-editor "test Class Diagram"] {
+    with [get-palette] {
+        with [get-palette-entry Associations] {
+            mouse-move 12 12 button1 -height 23 -width 130
+            mouse-press 12 12 button1 -height 23 -width 130
+            mouse-release 12 12 button1 524288 -height 23 -width 130
+        }
+        with [get-palette-entry "Association Class"] {
+            mouse-move 29 10 button1 -height 23 -width 130
+            mouse-press 29 10 button1 -height 23 -width 130
+            mouse-release 29 10 button1 524288 -height 23 -width 130
+        }
+    }
+    // AssociationClass1
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Interface1 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 82 38 button1 CTRL -height 71 -width 116
+            mouse-press 82 38 button1 CTRL -height 71 -width 116
+            mouse-release 82 38 button1 786432 -height 71 -width 116
+        }
+        with [get-edit-part -name Class1 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 53 52 button1 CTRL -height 71 -width 116
+            mouse-press 53 52 button1 CTRL -height 71 -width 116
+             mouse-release 53 52 button1 786432 -height 71 -width 116
+        }
+    }
+    // AssciationClass2
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Class1 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 85 30 button1 CTRL -height 71 -width 116
+            mouse-press 85 30 button1 CTRL -height 71 -width 116
+            mouse-release 85 30 button1 786432 -height 71 -width 116
+        }
+        mouse-move 618 182 -mask CTRL -height 550 -width 801
+        with [get-edit-part -name Class2 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 51 50 button1 CTRL -height 71 -width 116
+            mouse-press 51 50 button1 CTRL -height 71 -width 116
+            mouse-release 51 50 button1 786432 -height 71 -width 116
+            
+        }
+    }
+    // AssociationClass3
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Class5 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 100 25 button1 -height 71 -width 116
+            mouse-press 100 25 button1 -height 71 -width 116
+            mouse-release 100 57 button1 524288 -height 71 -width 116
+        }
+        with [get-edit-part -name Class4 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 56 39 button1 CTRL -height 71 -width 116
+            mouse-press 56 39 button1 CTRL -height 71 -width 116
+            mouse-release 56 39 button1 786432 -height 71 -width 116
+        }
+    }
+    // AssociationClass4
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Class4 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 75 36 button1 -height 71 -width 116
+            mouse-press 75 36 button1 -height 71 -width 116
+            mouse-release 75 54 button1 524288 -height 71 -width 116
+        }
+        with [get-edit-part -name Class3 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 28 35 button1 -height 71 -width 116
+            mouse-press 28 35 button1 -height 71 -width 116
+            mouse-release 28 35 button1 786432 -height 71 -width 116
+        }
+        key-type ESC
+    }
+}
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-property "element.edges.size" | equals 8 | verify-true
+    get-property "element.nodes.size" | equals 0 | verify-true
+    get-property "element.nodeListElements.size" | equals 0 | verify-true
+    get-property "element.containers.size" | equals 10 | verify-true
+    get-property "element.target.member.size" | equals 10 | verify-true
+    get-property "element.target.member.Class[0].name" | equals Class1 | verify-true
+    get-property "element.target.member.Class[1].name" | equals Class2 | verify-true
+    get-property "element.target.member.Class[2].name" | equals Class3 | verify-true
+    get-property "element.target.member.Class[3].name" | equals Class4 | verify-true
+    get-property "element.target.member.Class[4].name" | equals Class5 | verify-true
+    get-property "element.target.member.Interface[5].name" | equals Interface1 | verify-true
+    get-property "element.target.member.AssociationClass[6].name" | equals AssociationClass1 | verify-true
+    get-property "element.target.member.AssociationClass[7].name" | equals AssociationClass2 | verify-true
+    get-property "element.target.member.AssociationClass[8].name" | equals AssociationClass3 | verify-true
+    get-property "element.target.member.AssociationClass[9].name" | equals AssociationClass4 | verify-true
+}
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998--
diff --git a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/Contexts/ContextForConnectionDeletionInClassDiagram.ctx b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/Contexts/ContextForConnectionDeletionInClassDiagram.ctx
new file mode 100644
index 000000000..f2897528e
--- /dev/null
+++ b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/Contexts/ContextForConnectionDeletionInClassDiagram.ctx
@@ -0,0 +1,83 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.ecl
+Element-Name: ContextForConnectionDeletionInClassDiagram
+Element-Type: context
+Element-Version: 2.0
+Id: _--vM0PMtEeSJppkJ7ssP0Q
+Runtime-Version: 1.5.5.201503020312
+Save-Time: 5/5/15 5:18 PM
+
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
+Content-Type: text/ecl
+Entry-Name: .ecl.context
+
+// Create Classes
+with [get-editor "test Class Diagram"] {
+    with [get-palette | get-palette-entry Class] {
+        mouse-press 24 11 button1 -height 23 -width 130
+        mouse-release 24 11 button1 524288 -height 23 -width 130
+    }
+    // Class1
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        mouse-move 320 120 button1 CTRL -height 519 -width 802
+        mouse-press 320 120 button1 CTRL -height 519 -width 802
+        mouse-release 320 120 button1 786432 -height 519 -width 802
+    }
+    // Class2
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        mouse-move 620 120 button1 CTRL -height 514 -width 801
+        mouse-press 620 120 button1 CTRL -height 514 -width 801
+        mouse-release 620 120 button1 786432 -height 514 -width 801
+    }
+    // Class3
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        mouse-move 620 450 button1 CTRL -height 514 -width 801
+        mouse-press 620 450 button1 CTRL -height 514 -width 801
+        mouse-release 620 450 button1 786432 -height 514 -width 801
+    }
+    // Class4
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        mouse-move 320 450 button1 CTRL -height 551 -width 801
+        mouse-press 320 450 button1 CTRL -height 551 -width 801
+        mouse-release 320 450 button1 786432 -height 551 -width 801
+    }
+    // Class5
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        mouse-move 20 450 button1 CTRL -height 551 -width 801
+        mouse-press 20 450 button1 CTRL -height 551 -width 801
+        mouse-release 20 450 button1 786432 -height 551 -width 801
+    }
+    key-type ESC
+}    
+// Create an Interface
+with [get-editor "test Class Diagram"] {
+    with [get-palette | get-palette-entry Interface] {
+        mouse-move 56 16 button1 -height 23 -width 130
+        mouse-press 56 16 button1 -height 23 -width 130
+        mouse-release 56 16 button1 524288 -height 23 -width 130
+    }
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        mouse-move 20 120 button1 CTRL -height 586 -width 801
+        mouse-press 20 120 button1 CTRL -height 586 -width 801
+        mouse-release 20 120 button1 786432 -height 586 -width 801
+    }
+    key-type ESC
+}
+// Check context
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-property "element.target.ownedMember.size" | equals 6 | verify-true
+    get-property "element.target.ownedMember.Class[0].name" | equals Class1 | verify-true
+    get-property "element.target.ownedMember.Class[1].name" | equals Class2 | verify-true
+    get-property "element.target.ownedMember.Class[2].name" | equals Class3 | verify-true
+    get-property "element.target.ownedMember.Class[3].name" | equals Class4 | verify-true
+    get-property "element.target.ownedMember.Class[4].name" | equals Class5 | verify-true
+    get-property "element.target.ownedMember.Interface[5].name" | equals Interface1 | verify-true
+    get-edit-part -name Interface1
+    get-edit-part -name Class1
+    get-edit-part -name Class2
+    get-edit-part -name Class3
+    get-edit-part -name Class4
+    get-edit-part -name Class5
+}
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998--
diff --git a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/Contexts/ContextForInterfaceRealizationDeletionInClassDiagram.ctx b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/Contexts/ContextForInterfaceRealizationDeletionInClassDiagram.ctx
new file mode 100644
index 000000000..98ae83095
--- /dev/null
+++ b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/Contexts/ContextForInterfaceRealizationDeletionInClassDiagram.ctx
@@ -0,0 +1,85 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.ecl
+Element-Name: ContextForInterfaceRealizationDeletionInClassDiagram
+Element-Type: context
+Element-Version: 2.0
+Id: _hGqPMPNAEeSJppkJ7ssP0Q
+Runtime-Version: 1.5.5.201503020312
+Save-Time: 5/5/15 6:05 PM
+
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
+Content-Type: text/ecl
+Entry-Name: .ecl.context
+
+// Create Interface realizations
+with [get-editor "test Class Diagram"] {
+    with [get-palette | get-palette-entry "Interface Realization"] {
+        mouse-move 44 19 button1 -height 37 -width 130
+        mouse-press 44 19 button1 -height 37 -width 130
+        mouse-release 44 19 button1 524288 -height 37 -width 130
+    }
+    // InterfaceRealization1
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Class1 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 37 19 button1 CTRL -height 71 -width 116
+            mouse-press 37 19 button1 CTRL -height 71 -width 116
+            mouse-release 37 19 button1 786432 -height 71 -width 116
+        }
+        with [get-edit-part -name Interface1 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 49 7 button1 CTRL -height 71 -width 116
+            mouse-press 49 7 button1 CTRL -height 71 -width 116
+            mouse-release 49 7 button1 786432 -height 71 -width 116
+        }
+    }
+    // InterfaceRealization2
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Class5 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 48 3 button1 CTRL -height 71 -width 116
+            mouse-press 48 3 button1 CTRL -height 71 -width 116
+            mouse-release 48 3 button1 -mask 786432 -height 71 -width 116
+        }
+        with [get-edit-part -name Interface1 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 53 45 button1 CTRL -height 71 -width 116
+            mouse-press 53 45 button1 CTRL -height 71 -width 116
+            mouse-release 55 71 button1 786432 -height 100 -width 120
+        }
+    }
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Class4 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 65 31 button1 -height 71 -width 116
+            mouse-press 65 31 button1 -height 71 -width 116
+            mouse-release 65 67 button1 786432 -height 71 -width 116
+        }
+        with [get-edit-part -name Interface1 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 79 18 button1  -height 71 -width 116
+            mouse-press 79 18 button1  -height 71 -width 116
+            mouse-release 79 18 button1 786432 -height 71 -width 116
+        }
+        key-type ESC
+    }
+    
+}
+// Check context
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-property "element.edges.size" | equals 3 | verify-true
+    get-property "element.edges.DEdge[0].semanticElements.InterfaceRealization[0].source.Class[0].name" | equals Class1 
+        | verify-true
+    get-property "element.edges.DEdge[0].semanticElements.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+    get-property "element.edges.DEdge[1].semanticElements.InterfaceRealization[0].source.Class[0].name" | equals Class5 
+        | verify-true
+    get-property "element.edges.DEdge[1].semanticElements.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+    get-property "element.edges.DEdge[2].semanticElements.InterfaceRealization[0].source.Class[0].name" | equals Class4 
+        | verify-true
+    get-property "element.edges.DEdge[2].semanticElements.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+    get-property "element.target.ownedMember.Class[0].interfaceRealization.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+    get-property "element.target.ownedMember.Class[3].interfaceRealization.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+    get-property "element.target.ownedMember.Class[4].interfaceRealization.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+}
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998--
diff --git a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/DeleteAssociationClassInClassDiagram.test b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/DeleteAssociationClassInClassDiagram.test
new file mode 100644
index 000000000..3befb19f0
--- /dev/null
+++ b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/DeleteAssociationClassInClassDiagram.test
@@ -0,0 +1,147 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _MWdYgIBGEeS4X6G9cD21hw,_he-_gIBIEeS4X6G9cD21hw,_bKL_sH-PEeS4X6G9cD21hw,_X-rQgH-QEeS4X6G9cD21hw,_p-v3gMyvEeSmqoI7c5i_uw,_--vM0PMtEeSJppkJ7ssP0Q,_H8jl8PM6EeSJppkJ7ssP0Q
+Element-Name: DeleteAssociationClassInClassDiagram
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: 
+Id: _aIHDUPMtEeSJppkJ7ssP0Q
+Runtime-Version: 1.5.5.201503020312
+Save-Time: 5/5/15 5:25 PM
+Testcase-Type: ecl
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+Delete association class in class diagram
+tests
+- Delete associaton Class1 from click on (associationClass1 container)
+- Delete association class by selecting Link between Class1 and Class2
+- Delete association class3 by selecting dashed link
+- Delete a Class which have an Association Class
+
+Results
+1-3 Association class is removed from diagram and model
+4- Select class and linked association class are removed.
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+// Delete associaton Class1 from click on (associationClass1 container)
+with [get-editor "test Class Diagram"] {
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name AssociationClass1 | get-edit-part 
+            -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 47 54 button1 -height 71 -width 116
+            mouse-press 47 54 button1 -height 71 -width 116
+            mouse-release 47 54 button1 524288 -height 71 -width 116
+        }
+    }
+    get-button "Delete from Model" | click
+}
+// Check diagram
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    verify-error{get-edit-part -name AssociationClass1}
+    get-edit-part -name Class1 | verify-error{get-target-connection 0}
+}
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-property "element.target.member.size" | equals 9 | verify-true
+    get-property "element.target.member.Class[0].name" | equals Class1 | verify-true
+    get-property "element.target.member.Class[1].name" | equals Class2 | verify-true
+    get-property "element.target.member.Class[2].name" | equals Class3 | verify-true
+    get-property "element.target.member.Class[3].name" | equals Class4 | verify-true
+    get-property "element.target.member.Class[4].name" | equals Class5 | verify-true
+    get-property "element.target.member.Interface[5].name" | equals Interface1 | verify-true
+    get-property "element.target.member.AssociationClass[6].name" | equals AssociationClass2 | verify-true
+    get-property "element.target.member.AssociationClass[7].name" | equals AssociationClass3 | verify-true
+    get-property "element.target.member.AssociationClass[8].name" | equals AssociationClass4 | verify-true
+}
+
+
+// Delete association class by selecting Link between Class1 and Class2
+with [get-editor "test Class Diagram"] {
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        mouse-move 503 186 -height 550 -width 970
+        with [get-edit-part -name Class2 | get-target-connection 0] {
+            mouse-move 84 28 button1 -height 64 -width 209
+            mouse-press 84 28 button1 -height 64 -width 209
+            mouse-release 86 29 button1 524288 -height 66 -width 213
+        }
+    }
+    get-button "Delete from Model" | click
+    get-diagram -index 1 | get-edit-part -name "test Class Diagram" | mouse-move 3 72 -height 550 -width 970
+}
+// Check diagram
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-edit-part -name Class2 |verify-error{ get-target-connection 0}
+    verify-error{get-edit-part -name AssociationClass2}
+}
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-property "element.target.member.size" | equals 8 | verify-true
+    get-property "element.target.member.Class[0].name" | equals Class1 | verify-true
+    get-property "element.target.member.Class[1].name" | equals Class2 | verify-true
+    get-property "element.target.member.Class[2].name" | equals Class3 | verify-true
+    get-property "element.target.member.Class[3].name" | equals Class4 | verify-true
+    get-property "element.target.member.Class[4].name" | equals Class5 | verify-true
+    get-property "element.target.member.Interface[5].name" | equals Interface1 | verify-true
+    get-property "element.target.member.AssociationClass[6].name" | equals AssociationClass3 | verify-true
+    get-property "element.target.member.AssociationClass[7].name" | equals AssociationClass4 | verify-true
+}
+
+// Delete association class3 by selecting dashed link between AssociationClass3 and Link between Class1 and Class2
+with [get-editor "test Class Diagram"] {
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Class4 | get-target-connection 0 | get-target-connection 0] {
+            mouse-move 339 41 button1 -height 115 -width 496
+            mouse-press 339 41 button1 -height 115 -width 496
+            mouse-release 341 43 button1 524288 -height 119 -width 500
+        }
+    }
+    get-button "Delete from Model" | click
+}
+// Check diagram
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-edit-part -name Class4 |verify-error{ get-target-connection 0}
+    verify-error{get-edit-part -name AssociationClass3}
+}
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-property "element.target.member.size" | equals 7 | verify-true
+    get-property "element.target.member.Class[0].name" | equals Class1 | verify-true
+    get-property "element.target.member.Class[1].name" | equals Class2 | verify-true
+    get-property "element.target.member.Class[2].name" | equals Class3 | verify-true
+    get-property "element.target.member.Class[3].name" | equals Class4 | verify-true
+    get-property "element.target.member.Class[4].name" | equals Class5 | verify-true
+    get-property "element.target.member.Interface[5].name" | equals Interface1 | verify-true
+    get-property "element.target.member.AssociationClass[6].name" | equals AssociationClass4 | verify-true
+}
+
+// Delete a Class which have an Association Class
+with [get-editor "test Class Diagram"] {
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Class4 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 89 26 button1 -height 71 -width 116
+            mouse-press 89 26 button1 -height 71 -width 116
+            mouse-release 89 26 button1 524288 -height 71 -width 116
+        }
+    }
+    get-button "Delete from Model" | click
+}
+// Check diagram
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"]{
+    get-edit-part -name Class3 |verify-error{ get-target-connection 0}
+    verify-error{get-edit-part -name AssociationClass4}
+    verify-error{get-edit-part -name Class4}
+}
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-property "element.target.member.size" | equals 5 | verify-true
+    get-property "element.target.member.Class[0].name" | equals Class1 | verify-true
+    get-property "element.target.member.Class[1].name" | equals Class2 | verify-true
+    get-property "element.target.member.Class[2].name" | equals Class3 | verify-true
+    get-property "element.target.member.Class[3].name" | equals Class5 | verify-true
+    get-property "element.target.member.Interface[4].name" | equals Interface1 | verify-true
+}
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/DeleteInterfaceRealizationInClassDiagram.test b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/DeleteInterfaceRealizationInClassDiagram.test
new file mode 100644
index 000000000..4ae376073
--- /dev/null
+++ b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ClassDiagram/DeleteInterfaceRealizationInClassDiagram.test
@@ -0,0 +1,130 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _MWdYgIBGEeS4X6G9cD21hw,_he-_gIBIEeS4X6G9cD21hw,_bKL_sH-PEeS4X6G9cD21hw,_X-rQgH-QEeS4X6G9cD21hw,_p-v3gMyvEeSmqoI7c5i_uw,_--vM0PMtEeSJppkJ7ssP0Q,_hGqPMPNAEeSJppkJ7ssP0Q
+Element-Name: DeleteInterfaceRealizationInClassDiagram
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: 
+Id: _DZ9vEPM7EeSJppkJ7ssP0Q
+Runtime-Version: 1.5.5.201503020312
+Save-Time: 5/5/15 6:08 PM
+Testcase-Type: ecl
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+Delete association class in class diagram
+tests
+-  Delete Interface Realization by selecting Interface realization link
+- Delete class source which is of interface realization
+- Delete Interface which is the target of an interface realization
+
+Results
+1- Inteface Realization is removed from diagram and model
+2-3 Selected element and interface realization are removed.
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+// Delete Interface Realization by selecting Interface realization link
+with [get-editor "test Class Diagram"] {
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Interface1 | get-target-connection 0] {
+            mouse-move 162 27 button1 -height 44 -width 209
+            mouse-press 162 27 button1 -height 44 -width 209
+            mouse-release 164 28 button1 524288 -height 47 -width 213
+        }
+    }
+    get-button "Delete from Model" | click
+}
+// Check diagram
+get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram" 
+    | get-edit-part -name Interface1 | get-target-connection 0
+get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram" 
+    | get-edit-part -name Interface1 | get-target-connection 1
+get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram" 
+    | get-edit-part -name Interface1 | verify-error{get-target-connection 2}
+//Check model
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-property "element.edges.size" | equals 2 | verify-true
+    get-property "element.edges.DEdge[0].semanticElements.InterfaceRealization[0].source.Class[0].name" | equals Class5 
+        | verify-true
+    get-property "element.edges.DEdge[0].semanticElements.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+    get-property "element.edges.DEdge[1].semanticElements.InterfaceRealization[0].source.Class[0].name" | equals Class4 
+        | verify-true
+    get-property "element.edges.DEdge[1].semanticElements.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+    verify-error{get-property "element.target.ownedMember.Class[0].interfaceRealization.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true}
+    get-property "element.target.ownedMember.Class[3].interfaceRealization.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+    get-property "element.target.ownedMember.Class[4].interfaceRealization.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+}
+
+// Delete class source which is of interface realization
+with [get-editor "test Class Diagram"] {
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Class4 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 37 17 button1 -height 71 -width 116
+            mouse-press 37 17 button1 -height 71 -width 116
+            mouse-release 37 17 button1 524288 -height 71 -width 116
+        }
+    }
+    get-button "Delete from Model" | click
+}
+// Check diagram
+get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram" 
+    | get-edit-part -name Interface1 | get-target-connection 0
+get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram" 
+    | get-edit-part -name Interface1 | verify-error{get-target-connection 1}
+//Check model
+
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-property "element.target.ownedMember.size" | equals 5 | verify-true
+    get-property "element.target.ownedMember.Class[0].name" | equals Class1 | verify-true
+    get-property "element.target.ownedMember.Class[1].name" | equals Class2 | verify-true
+    get-property "element.target.ownedMember.Class[2].name" | equals Class3 | verify-true
+    get-property "element.target.ownedMember.Class[3].name" | equals Class5 | verify-true
+    get-property "element.target.ownedMember.Class[3].interfaceRealization.size" | equals 1 | verify-true
+    get-property "element.target.ownedMember.Class[3].interfaceRealization.InterfaceRealization[0].owner.name" 
+        | equals Class5 | verify-true
+    get-property "element.target.ownedMember.Class[3].interfaceRealization.InterfaceRealization[0].source.Class[0].name" 
+        | equals Class5 | verify-true
+    get-property "element.target.ownedMember.Class[3].interfaceRealization.InterfaceRealization[0].target.Interface[0].name" 
+        | equals Interface1 | verify-true
+    get-property "element.target.ownedMember.Class[3].interfaceRealization.InterfaceRealization[0].client.Class[0].name" 
+        | equals Class5 | verify-true
+    get-property "element.target.ownedMember.Class[3].interfaceRealization.InterfaceRealization[0].supplier.Interface[0].name" 
+        | equals Interface1 | verify-true
+    get-property "element.target.ownedMember.Interface[4].name" | equals Interface1 | verify-true
+}
+
+// Delete Interface which is the target of an interface realization
+with [get-editor "test Class Diagram"] {
+    with [get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+        with [get-edit-part -name Interface1 | get-edit-part -className DNodeListViewNodeListCompartment2EditPart] {
+            mouse-move 74 11 button1 -height 71 -width 116
+            mouse-press 74 11 button1 -height 71 -width 116
+            mouse-release 74 11 button1 524288 -height 71 -width 116
+        }
+    }
+    get-button "Delete from Model" | click
+}
+// Check diagram
+get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram" 
+    | verify-error{get-edit-part -name Interface1}
+//Check model
+with [get-editor "test Class Diagram" | get-diagram -index 1 | get-edit-part -name "test Class Diagram"] {
+    get-property "element.target.ownedMember.size" | equals 4 | verify-true
+    get-property "element.target.ownedMember.Class[0].name" | equals Class1 | verify-true
+    get-property "element.target.ownedMember.Class[1].name" | equals Class2 | verify-true
+    get-property "element.target.ownedMember.Class[2].name" | equals Class3 | verify-true
+    get-property "element.target.ownedMember.Class[3].name" | equals Class5 | verify-true
+    get-property "element.target.ownedMember.Class[3].interfaceRealization.size" | equals 0 | verify-true
+}
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ComponentDiagram/Contexts/ContextForPortDeletionInComponentDiagramInTestProject.ctx b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ComponentDiagram/Contexts/ContextForPortDeletionInComponentDiagramInTestProject.ctx
new file mode 100644
index 000000000..ab427860f
--- /dev/null
+++ b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ComponentDiagram/Contexts/ContextForPortDeletionInComponentDiagramInTestProject.ctx
@@ -0,0 +1,126 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.ecl
+Element-Name: ContextForPortDeletionInComponentDiagramInTestProject
+Element-Type: context
+Element-Version: 2.0
+Id: _lpWfYPPREeSNxvhm9gIftQ
+Runtime-Version: 1.5.5.201503020312
+Save-Time: 5/6/15 11:24 AM
+
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
+Content-Type: text/ecl
+Entry-Name: .ecl.context
+
+// Context for Component Port deletion
+with [get-editor "NewModel Component Diagram"] {
+   // Add a usage from port to delete
+   with [get-palette | get-palette-entry Usage] {
+        mouse-move 60 13 button1 -height 23 -width 130
+        mouse-press 60 13 button1 -height 23 -width 130
+        mouse-release 60 13 button1 524288 -height 23 -width 130
+    }
+    
+    with [get-diagram -index 1 | get-edit-part -name "NewModel Component Diagram"] {
+        with [get-edit-part -name Component1 | get-edit-part -name port1] {
+            with [get-edit-part -className BundledImageEditPart] {
+                mouse-move 7 4 button1 -height 20 -width 20
+                mouse-press 7 4 button1 -height 20 -width 20
+                mouse-release 7 4 button1 524288 -height 20 -width 20
+            }
+        }
+        with [get-edit-part -name Interface1 | get-edit-part 
+            -className RotatableImageBasedOnFirstSourceConnectionEditPart] {
+            mouse-move 19 6 button1 -height 30 -width 30
+            mouse-press 19 6 button1 -height 30 -width 30
+               mouse-release 19 6 button1 524288 -height 30 -width 30
+         
+        }
+    }
+    // Add an Interface realization
+    with [get-palette | get-palette-entry "Interface Realization"] {
+        mouse-move 73 20 button1 -height 37 -width 130
+        mouse-press 73 20 button1 -height 37 -width 130
+        mouse-release 73 20 button1 524288 -height 37 -width 130
+    }
+    with [get-diagram -index 1 | get-edit-part -name "NewModel Component Diagram"] {
+        with [get-edit-part -name Component1 | get-edit-part -name port1 | get-edit-part 
+            -className BundledImageEditPart] {
+            mouse-move 11 1 button1 -height 20 -width 20
+            mouse-press 11 1 button1 -height 20 -width 20
+            mouse-release 11 1 button1 524288 -height 20 -width 20
+        }
+        with [get-edit-part -name Interface2 -index 1 | get-edit-part -className BundledImageEditPart] {
+            mouse-move 6 3 button1 -height 20 -width 20
+            mouse-press 6 3 button1 -height 20 -width 20
+            mouse-release 6 3 button1 524288 -height 20 -width 20
+        }
+    }
+    // Add a Redefined from the port to delete
+    with [get-palette | get-palette-entry Redefined] {
+            mouse-move 43 6 button1 -height 23 -width 130
+            mouse-press 43 6 button1 -height 23 -width 130
+            mouse-release 43 6 button1 524288 -height 23 -width 130
+    }
+    with [get-diagram -index 1 | get-edit-part -name "NewModel Component Diagram"] {
+       with [get-edit-part -name Component1 | get-edit-part -name port1 | get-edit-part 
+            -className BundledImageEditPart] {
+            mouse-move 8 12 button1 -height 20 -width 20
+            mouse-press 8 12 button1 -height 20 -width 20
+            mouse-release 8 12 button1 524288 -height 20 -width 20
+        }
+        with [get-edit-part -name Component2] {
+            with [get-edit-part -name port1 | get-edit-part -className BundledImageEditPart] {
+                mouse-move 9 6 button1 -height 20 -width 20
+                mouse-press 9 6 button1 -height 20 -width 20
+                mouse-release 9 6 button1 524288 -height 20 -width 20
+            }
+        }
+    }
+    // Add a Redefined to the port to delete
+    with [get-palette | get-palette-entry Redefined] {
+        mouse-move 62 4 button1 -height 23 -width 130
+        mouse-press 62 4 button1 -height 23 -width 130
+        mouse-release 62 4 button1 524288 -height 23 -width 130
+    }
+    with [get-diagram -index 1 | get-edit-part -name "NewModel Component Diagram"] {
+        with [get-edit-part -name Component2 | get-edit-part -name port1] {
+            with [get-edit-part -className BundledImageEditPart] {
+                mouse-move 15 10 button1 -height 20 -width 20
+                mouse-press 15 10 button1 -height 20 -width 20
+                mouse-release 15 10 button1 524288 -height 20 -width 20
+            }
+        }
+        with [get-edit-part -name Component1 | get-edit-part -name port1 | get-edit-part 
+            -className BundledImageEditPart] {
+            mouse-move 15 7 button1 -height 20 -width 20
+            mouse-press 15 7 button1 -height 20 -width 20
+            mouse-release 15 7 button1 524288 -height 20 -width 20
+        }
+        key-type ESC
+    }
+}
+// Check context
+with [get-editor "NewModel Component Diagram" | get-diagram -index 1 | get-edit-part 
+    -name "NewModel Component Diagram"] {
+    get-property "children.size" | equals 6 | verify-true
+    get-property "children.Node[0].element.name" | equals Component1 | verify-true
+    get-property "children.Node[1].element.name" | equals Component2 | verify-true
+    get-property "children.Node[2].element.name" | equals Interface1 | verify-true
+    get-property "children.Node[3].element.name" | equals Interface1 | verify-true
+    get-property "children.Node[4].element.name" | equals Interface2 | verify-true
+    get-property "children.Node[5].element.name" | equals Interface2 | verify-true
+    get-property "edges.size" | equals 4 | verify-true
+    with [get-edit-part -name Component1 | get-edit-part -name port1 | get-target-connection 1] {
+        get-property visible | equals true | verify-true
+        get-property visible | equals true | verify-true
+        get-figure 3 | get-property "isVisible()" | equals true | verify-true
+    }
+    get-edit-part -name Component2 | get-edit-part -name port1 | get-target-connection 0 | get-figure 3 
+        | get-property "isVisible()" | equals true | verify-true
+    get-edit-part -name Interface2 -index 1 | get-target-connection 0 | get-property visible | equals true | verify-true
+    get-property visible | equals true | verify-true
+    get-edit-part -name Component1 | get-edit-part -name port1 | get-target-connection 0 | get-property visible 
+        | equals true | verify-true
+}
+------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998--
diff --git a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ComponentDiagram/DeletePortInComponentDiagram.test b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ComponentDiagram/DeletePortInComponentDiagram.test
new file mode 100644
index 000000000..1a619b240
--- /dev/null
+++ b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ComponentDiagram/DeletePortInComponentDiagram.test
@@ -0,0 +1,72 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _MWdYgIBGEeS4X6G9cD21hw,_he-_gIBIEeS4X6G9cD21hw,_bKL_sH-PEeS4X6G9cD21hw,_X-rQgH-QEeS4X6G9cD21hw,_XEsC0NRmEeSQYq5tjqphxg,_0gdt4NRyEeSda_OhYkGJCQ,_RrpfwNShEeSda_OhYkGJCQ,_C3JgYNa0EeScE-aTfGIfZQ,_TAnaINa7EeScE-aTfGIfZQ,_ByYYQNbWEeSrE7oyAIQ47g,_lpWfYPPREeSNxvhm9gIftQ
+Element-Name: DeletePortInComponentDiagram
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: 
+Id: _zVSAsPPNEeSNxvhm9gIftQ
+Runtime-Version: 1.5.5.201503020312
+Save-Time: 5/6/15 11:29 AM
+Testcase-Type: ecl
+Verifications: _WJH2QPPSEeSNxvhm9gIftQ
+
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
+Content-Type: text/plain
+Entry-Name: .description
+
+Open test Project /component diagram which contain 2 components, to interfaces, interface realization, Usage and redefined links.
+
+Test:
+delete port
+
+Result:
+Port and connections are removed from diagram and model
+- check diagram
+- check model
+------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa--
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+// Delete Port
+with [get-editor "NewModel Component Diagram"] {
+    with [get-diagram -index 1 | get-edit-part -name "NewModel Component Diagram"] {
+        with [get-edit-part -name Component1] {
+            with [get-edit-part -name port1 | get-edit-part -className BundledImageEditPart] {
+                mouse-move 12 6 button1 -height 20 -width 20
+                mouse-press 12 6 button1 -height 20 -width 20
+                mouse-release 12 6 button1 524288 -height 20 -width 20
+            }
+        }
+    }
+    get-button "Delete from Model" | click
+}
+//Check Diagram
+with [get-editor "NewModel Component Diagram" | get-diagram -index 1 | get-edit-part 
+    -name "NewModel Component Diagram"] {
+    get-edit-part -name Component1 | verify-error{get-edit-part -name port1}
+    get-edit-part -name Component2 | get-edit-part -name port1 | get-edit-part -className BundledImageEditPart 
+        | get-figure 0 | get-property "isVisible()" | equals true | verify-true
+    get-property "element.edges.size" | equals 0 | verify-true
+    get-property "children.size" | equals 6 | verify-true
+    get-property "element.nodes.size" | equals 5 | verify-true
+    get-property "element.nodes.DNode[0].name" | equals port1 | verify-true
+    get-property "element.nodes.DNode[1].name" | equals Interface1 | verify-true
+    get-property "element.nodes.DNode[2].name" | equals Interface2 | verify-true
+    get-property "element.nodes.DNode[3].name" | equals Interface1 | verify-true
+    get-property "element.nodes.DNode[4].name" | equals Interface2 | verify-true
+}
+// Check Model
+with [get-editor "NewModel Component Diagram" | get-diagram -index 1 | get-edit-part 
+    -name "NewModel Component Diagram"] {
+    get-property "element.target.member.size" | equals 4 | verify-true
+    get-property "element.target.member.Component[0].name" | equals Component1 | verify-true
+    get-property "element.target.member.Component[0].ownedMember.size" | equals 0 | verify-true
+    get-property "element.target.member.Component[1].name" | equals Component2 | verify-true
+    get-property "element.target.member.Component[1].member.size" | equals 1 | verify-true
+    get-property "element.target.member.Component[1].member.Port[0].name" | equals port1 | verify-true
+    get-property "element.target.member.Interface[2].name" | equals Interface1 | verify-true
+    get-property "element.target.member.Interface[3].name" | equals Interface2 | verify-true
+}
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ComponentDiagram/Verifications/DeletePortInComponentDiagramVerification.verification b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ComponentDiagram/Verifications/DeletePortInComponentDiagramVerification.verification
new file mode 100644
index 000000000..c44cc9d5e
--- /dev/null
+++ b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ComponentDiagram/Verifications/DeletePortInComponentDiagramVerification.verification
@@ -0,0 +1,84 @@
+--- RCPTT verification ---
+Format-Version: 1.0
+Element-Name: DeletePortInComponentDiagramVerification
+Element-Type: verification
+Element-Version: 2.0
+Id: _WJH2QPPSEeSNxvhm9gIftQ
+Runtime-Version: 1.5.5.201503020312
+Save-Time: 5/6/15 11:29 AM
+Verification-Type: org.eclipse.rcptt.verifications.tree
+
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf
+Content-Type: q7/binary
+Entry-Name: .q7.content
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnTtnFlvHEeWhd8HmP9Q4EO/mYx98Uhu
+xIrRYNxww7O9GbRUksvNbYolyQ3Mj5/vFimaFEmLkkjb42E+pLKqIiMjzt3OuUnoyZ9/OjxYvFmuT1fH
+R0939K7aWSyPnh+/WB29errzevPyi7Tz56/+8R+eHK9f7S6fH6xOTpe76+cnm80uN61erp7vb7jzdHez
+Xi6//DdO/3Hp68VPh6svLyY3MjmPOzr9ku+f7vyw2Zx8ubf39u3b3ePDV7s8Ye+/vn72bshdHngxx7uB
+Msd28N6VwXsyeGdxtH/ILX15sNwsvzleb54dtePDk+Oj5dGmr/ZfrfcPLy9+Z7F68XTnu//8l382f/3m
+m2/H8tu//PTmh8P86tnLzV93FqdM83xzvH6682q5+eLNavl28af/fn28+aevj18sDxbjp5OD4/Vyffbd
+4n8WMmq7DNBcLJ7I5eJ08/cDVuSjciZo7QT7/e8Pljx3s37Nik9ZZTs+eH149OyIL7/QZ3dz//r47en5
+NZ/e7B+8Xv78mW9e7G/2F5vlTxumWp5udi79xq+rw/1Xy8XJ/uaHpzuXgX692l29WO6tngtoL18fHOwd
+f/+jDnsn6x+/42r35OjV1ZnkScvnx+sznG+Y8XS1Xr0+ZeIrk75ZM6lgdnK8Otp8t53+zXr31erlzt7V
+le5tl3r1u5cA+2p9/ProBdgcr9+74/v953+79OtiLXAa73cWr8D86Pz6ewA7u7x8+5M9we1nXPfeA/bJ
+8x9WBy/Wy6PL91wD/yr836yPf8RTFn15sjx6QXCtlqfXQLzNIO/Dd2aO8ykvz3gDdh9C6jOxuobWDXh9
+LBIPgsOv6S/X/ONTPOZQMsju68ODO7sJY42cdpcvVuSk6wH871//6zYvzdXBcgvRezN/Thx/uzyVBN/P
+7j++KYxvDuTfh4PeYKCbTXTVSH86OE/1Xy3+sny7vboB1DsZ7Lq5ttPdiOOHMfts1G7A7UbkbsPuNvSu
+4tf3T3/4/nh//eI6ah/OAy/OyvX77rjFrn+7PNw/2qyen9f0W2C8DuQZTDZfoBTDO5CkNt84xecifSPW
+t6B9Z/x+BfR+Kye8OVg/ww3fxe7iggouznf+6Jef5JcfA+ijo55/fwdHlXpzAelXP6OrP8pPP1B3Lma9
+s3P+zrzvI1B6KIz+8B5nHj3uFlRvx/U6stKA+GpxwvnGCP50RGXiW8G8G5z3AugtkN4K6kdD9CAA/bbe
+dlu0flpUPma4OzjZs6PNcv1y//nyq8XF5b2628Wsv1Ofu1NNvSNKD4XRH97j7rWm/mE97h5z3P8tj/u4
+vtP9d51+/T7dTW3TD7dIH65B+qDt0d/6Lce9dK3Xy5P18hTWcP6Cbn91vTf1kf39b7ffPvasf+mlyodh
+v1fQ/5/FwS+8Rr2/l6gP+Qr1OqS/BOhnwHkFzCd7F++nn2xfvp9dbpdyuvjb8u/30+5bbCPj6U7KXrnh
+ouqq6KKKOju6yy45583ZR60u/k3Knl2bZLqa/uwTZ+Zpnlts8i4rWz1T2+FbTttzcCG4PEOMs/Rsim2R
+MSV750Moml/l7GWMfMM5bM8jzJKLKaOpHocdPftaGnPX1hJPTSbEzsNmGJkBruXoB0N0aCmW4W2PfQRd
+YnYu1F60t3NM3erMrfnJeWzPLQBA9Noyk1IzRR/VmNtDPR6Px+PxeDwedzi6LdNkNc4+GRupIo48PO/h
+UCoEQ0HJ4Wz2MKhTzmnvYsot9TZ7VyMZylFTfqhiTJqGkhSSr6bp7sKIfZLdrQvaaktdGan5mmfKJtpM
+UdNDjTaaMdw8qh7NxWpmrCqN2aOJVCiv05CxMxgberEheB97TNNOylnVgRKTtK66x6xzblG5kFJzOvgR
+dTOxJp4xhy4muNILpTNGpWoashs3bc4j1pFt1bo3nVnFGGG8Q5g9e2q2K8OZoJI5pxK3coSP6ll+BjE4
+N4qe4DDD+U+zXjZR7d3a6aozXuuU1NSzZt9M8cAQKqiV6quz0QbtisMCqSeMrLzTzgY+RuOsaglDVZtS
+VKVp+RNArK9VLa7M6ZyZuYCzjakyztUcY7PZ6cGQOqcfeioQtqYNPpc442gQhlI6VADM8Zdqm1XaNpab
+K7bvBSvOYqpXodsBYWDVMWc2E3Xu2DiY1GfFB2tJabamYuvGhGpKVgaXCKnwvCkcJHbnknaqFJ8U3KUX
+0yvOqEZvQKJmThregi9Z4+PM2rWKzXNvhJJjRYXF1RQbG8oavKFYvTNjhMuUrPtQ1YVpVK5B+6lLG6Gk
+UeBrUSsNHFWxnqEgQFrrzFAdMfLUZ34qv0frzYjTdQMt0gJWLDya3aasp5lWY9gSYuDJNuSi08T/PUuf
+pTYIoQ/d9RANweZStp/qvHdRWt99jo66Z4fX/kpOyh1fwJWbddyTAhCFPCC6WjOk+k4+UoAEl8YJPGGR
+Cs5dJuhlq/nF+UkyZTDPwTuSTt6nYrUTeHswvfRuXPJRw5ehxtjc1V7TVFZP2yZs12ImqxM/ZaG9yVsm
+atOERqKrDj/IseH2ZfpMrh4xQZgJq4DZGhRdq95ym8HBwfFBTSj4NozR2hAGKgNSbb2H1Cp5Fq6vdI0h
+TmsV1Nsal3E/N73Hk2b0dXaFJugJCBsCwhGkylnJ18SmCqiFaQhxOxPR7axzPN+kJjc38kIk+/rEB9WB
+Isnf/yqWH8kWJcLzre4mN2VKCkVZXwiUOpQEBqYwBH8hKgyVKbsoOoJQGdaNahjFfiO4RFXxdU15AAQ9
+WEZQlugly7NASz7q1anomyBIRSC+iKGAKBqljorFRgpB1Uy2r5rZOoWnukKJwfxYerTGo1WyBD/GUmYQ
+bW5W5cg4I88RIoXAj0BGyLVZidKmhs4+ujF9LBE0SUY4SnOmxBZJYNba0hRpU6xNQsitkF+wd1K+1Kxc
+9ZLnvNHGc035yQMLk6IN6QqP2GYejYcG3aiI2oR7qTl36Rr+vmJYX45hcjd0QtkIKrZOKrdtYU5KDRkZ
+Z5xSAwIAUvHJdDa0TAhQSKbOWI4qZmoLJuAR4Nymn3EORaAHmyqGtFRAhelwTyylOjSD6asQHgKuxZbY
+k+8BN7E5alRtlnDkGIQ5dIaYQozDb6yrhtijZkbVeh69mjFbiDlh7Uik1BDYMmI8+TzrYBlhkCM6FRDv
+iUkcFQ4F0+p4Ojtj/iEuj/OplKQMQsKsZ7k64TE4E8EZXakMGTn5WRsZkHlIb8MEAbXjXZpyQrLzmtAf
+rBRyZotCo1uKOHuk9tlBTWwUnyEF2lC/3QxTyj2Pgy5JPFdiksJFaAIMSWPqwHCqt5k8gXo3POZgGu4o
+EkoqxIQ9UqCiaQjbGK51R50jjRGnCVeHikVihD33DD2gdsHuWiQp6Woc2ZMso87uGExPrcNDGNFH9VM6
+BD1HO7d0U3VNugdDFoNxSDBxVjhixBVHdzI4S8IX9mFm0WQ49gWEZAjAJIXgFkGLZb2nNo8oZZptEuKA
+7vjkJQ8lcV2emxXVmDwZMpzigdjhxSv/+yaGSb0fY5o01cmqOJUPuD8ZfeAeGEJ8iaEg7w2sZ/QRKiFJ
+Njexk+MabCkPmV655lIs01Jitt7iulakSNc7dTBOuBuo8ZCmJxNOhio7g/C/MYwi8QuYcBYJrqFrEFoD
+Q8yxBFyAW4LyRC2VhqgZpHiMVW2kSEOVpFCqiSPbJpzHOMUCKdy4DdVVBVIqJmzbzcP3EQNUkol3Nuh+
++VQLftxf+D9c509HmCObC74SJrEVnJxMYE1KlkqYUoU7KPhQUT57gpNs55IZGaeGqlOm55bZc1ZwYb7B
+9eU6cS1RySI1XIgaRfRnrjs5Sa63ZyVh0VLkmpjlboiVfO9SgRDZ7bkImSXHJTII7mUJTy8KgXyvHcU3
+bc9cP3b+Ho/H4/F4PO5+jAE9VumciTxs5y/Gy+wh9jZbheBtO38wUg2RQjdauLeTpp4pbmZhs0idLjze
+U+lNLKi8lo0R8t7gCSrBA+Cy0BEqFVoTiRZMhc0JGx0ozNx600MzP3w2oadhvcVxF1QBuahrMwg7kdYV
+AmpzsQlVWBviQE+ubKDqmwJRQTugr2CD8mAYOooXSRuHh/0UKIUuKAl4TI3TKRQtDD7PBPWHMOd3Zfm+
+2d7Vv+25b8rX/fuULynp5Cm+QIogkJEZFiXcg+rIIScyC44NYS7FgTGlGjIH0Z9etZYa7CvmXqWhaxBM
+kAvEUy41FqPLUL1WJW/3EsM6Bo6pYUlshhyWlpzSyHM0GPQEGjaslg6HhaG3WZSwEigdjmcQHAp5hhxQ
+Ex1npVUhlNNjUdm+LlA4LfJPQyenl04FYq3KYqWNIiIEGyF3ZP5R4KFbjj8rugVypOEdIQ1nYYUiJAO+
+UhSKHsYP3S34gWgHdoF+QmJUvA4+CWMWEYLeU9ISiShSXxD2QUc4Jpw3EDatJml7W+m24vYp8ZTQVWPV
+yBprhKJFAxfKbYjUTH3AWpEXQ0kLEWplESfu0x3uw6/07yr9b35lf9/aP7f3nRSqbkLPdsRQt12ZOQ15
+ATY5JJkgyGJGTvgUkAVZm0E4dytdWTi+8UXzBOPSMK2BvCXAu8ZFoohLkooYVrpSyBPcAc2/tbNH085Z
+anC5C/xMDKnV6NUgfR+PvC8kqd6h4ng+th8jiE9JO0K8K2ZpbDM5WW50+UWzYAQQuYXsYrY95G33YZuB
+nB09KZXVCG424Jhnb7+1Vj6kRiTAoLWQem6a2+5DwOekeQiTV/Br10RnMyiEsb0XFRbYNCaROLKIelyw
+bntnhjCREWedOTT7sAVYI3Jsi+6UNpW8np+NGTwlxTolvUp5aY9kJ5JKMJ2ELgmCMLY4bEQVypNh+dL2
+niYGwlDU27DSuAnyVogKgaZGpfGPqBdDeCszJAcI+DWOmpHlhBAuPluftY8hs3rfIzOxn2oF8pn1zI2d
+oOoAy5GVesV/GIyIYC+z1k7VAW/0hmxrhOLJ5tI8BxqRsnnUNuzwjI01OelMIIDwKRaot11GIrWwI+3J
+aqwhtl6l/Te7ZBYSnugtbbHxJGm5Pu0AFkupsRQh18Bdo5csC3JgQBYkTTh8k5ygaiOXyFszNfFOKTOz
+ZOKAz8jvHIJMPDsLCzNunbsCCumaYqcSAjdJ8kCryz+iBilMkyKG9Spqzj9Qjfr5by3vuz4Fc70loSUd
+UiuoHlP+mCWwVTFzNpJDSdLSCFND96xiNvLaQ9ksPZ6Rpuj+4aQpqHFnsggJtrOupkNpeItUN1Szws0c
+FV5ULCmlyT1KKglJAQNYVkt2DslToIxK0osbETYzZZGaX72ignRnMYvA7VHcimhOZVgW8ItmeLL3Sf89
+CXf+L1BLBwhO8rzikg8AAABFAABQSwECFAAUAAgICAAAACEATvK84pIPAAAARQAACAAAAAAAAAAAAAAA
+AAAAAAAALmNvbnRlbnRQSwUGAAAAAAEAAQA2AAAAyA8AAAAA
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf--
diff --git a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/PackageHierarchyDiagram/DeletePackageInPackageHierarchyDiagram.test b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/PackageHierarchyDiagram/DeletePackageInPackageHierarchyDiagram.test
index 5cea5f1e8..8dd1c1d07 100644
--- a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/PackageHierarchyDiagram/DeletePackageInPackageHierarchyDiagram.test
+++ b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/PackageHierarchyDiagram/DeletePackageInPackageHierarchyDiagram.test
@@ -7,7 +7,7 @@ Element-Version: 3.0
 External-Reference: 
 Id: _K9elcN9TEeSEJ-mMQXHd1A
 Runtime-Version: 1.5.5.201503020312
-Save-Time: 4/10/15 10:56 AM
+Save-Time: 5/4/15 11:44 AM
 Testcase-Type: ecl
 
 ------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -149,19 +149,19 @@ with [get-editor "NewModel Package Hierarchy" | get-diagram -index 1 | get-edit-
     get-property "element.target.member.Package[2].name" | equals Package8 | verify-true
 }
 
+
 with [get-editor "NewModel Package Hierarchy" | get-diagram -index 1 | get-edit-part 
     -name "NewModel Package Hierarchy"] {
-    // Check ContainedIn connection from Package2 to Package6
-    verify-error {get-property "element.diagramElements.DEdge[0].target.qualifiedName" 
-        | equals "NewModel::Package6::Package2" | verify-true}
-    // Check ContainedIn connection from Package3 to Package7 
-    verify-error {get-property "element.diagramElements.DEdge[1].target.qualifiedName" 
-        | equals "NewModel::Package7::Package3" | verify-true}
-    // Check Import connection from Package4 to Package8 
-    verify-error {get-property "element.diagramElements.DEdge[2].target.visibility" 
-        | equals public | verify-true}
-    // Check Import connection from Package5 to Package9 
-    verify-error {get-property "element.diagramElements.DEdge[3].target.visibility" 
-        | equals public | verify-true}
+    get-property "diagram.element.diagramElements.size" | equals 3 | verify-true
+    get-property "diagram.element.diagramElements.DNode[0].name" | equals Package5 | verify-true
+    get-property "diagram.element.diagramElements.DNode[0].outgoingEdges.size" | equals 0 | verify-true
+    get-property "diagram.element.diagramElements.DNode[0].incomingEdges.size" | equals 0 | verify-true
+    get-property "diagram.element.diagramElements.DNode[1].name" | equals Package6 | verify-true
+    get-property "diagram.element.diagramElements.DNode[1].outgoingEdges.size" | equals 0 | verify-true
+    get-property "diagram.element.diagramElements.DNode[1].incomingEdges.size" | equals 0 | verify-true
+    get-property "diagram.element.diagramElements.DNode[2].name" | equals Package8 | verify-true
+    get-property "diagram.element.diagramElements.DNode[2].outgoingEdges.size" | equals 0 | verify-true
+    get-property "diagram.element.diagramElements.DNode[2].incomingEdges.size" | equals 0 | verify-true
+    get-property "diagram.element.edges.size" | equals 0 | verify-true
 }
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ReusedTools/issue660testsuite.suite b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ReusedTools/issue660testsuite.suite
new file mode 100644
index 000000000..7ad6ef94f
--- /dev/null
+++ b/tests/org.obeonetwork.dsl.uml2.tests.rcptt/ReusedTools/issue660testsuite.suite
@@ -0,0 +1,23 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Element-Name: issue660testsuite
+Element-Type: testsuite
+Element-Version: 2.0
+Id: _0JkPgPMsEeSJppkJ7ssP0Q
+Runtime-Version: 1.5.5.201503020312
+Save-Time: 5/6/15 11:50 AM
+
+------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
+Content-Type: text/testcase
+Entry-Name: testcase-items
+
+_K9elcN9TEeSEJ-mMQXHd1A	// kind: 'test' name: 'DeletePackageInPackageHierarchyDiagram' path: '../PackageHierarchyDiagram/DeletePackageInPackageHierarchyDiagram.test'
+_J0lVoN9REeSEJ-mMQXHd1A	// kind: 'test' name: 'DeleteDependencyInPackageHierarchyDiagram' path: '../PackageHierarchyDiagram/DeleteDependencyInPackageHierarchyDiagram.test'
+_Gyxm8d9QEeSEJ-mMQXHd1A	// kind: 'test' name: 'DeleteImportInPackageHierarchyDiagram' path: '../PackageHierarchyDiagram/DeleteImportInPackageHierarchyDiagram.test'
+_H5BLYN9SEeSEJ-mMQXHd1A	// kind: 'test' name: 'DeleteMergeInPackageHierarchyDiagram' path: '../PackageHierarchyDiagram/DeleteMergeInPackageHierarchyDiagram.test'
+_aIHDUPMtEeSJppkJ7ssP0Q	// kind: 'test' name: 'DeleteAssociationClassInClassDiagram' path: '../ClassDiagram/DeleteAssociationClassInClassDiagram.test'
+_DZ9vEPM7EeSJppkJ7ssP0Q	// kind: 'test' name: 'DeleteInterfaceRealizationInClassDiagram' path: '../ClassDiagram/DeleteInterfaceRealizationInClassDiagram.test'
+_zVSAsPPNEeSNxvhm9gIftQ	// kind: 'test' name: 'DeletePortInComponentDiagram' path: '../ComponentDiagram/DeletePortInComponentDiagram.test'
+_5XWqsNbrEeSrE7oyAIQ47g	// kind: 'test' name: 'DeleteInterfaceInComponentDiagram' path: '../ComponentDiagram/DeleteInterfaceInComponentDiagram.test'
+
+------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--