[471547] Migrate Junit Test data expression from legacy to AQL

Migrates 37% of the Acceleo2 expressions / 84% of occurrences

Bug: 471547
Change-Id: Iff5d8cecf63cebfb78abc0770bf36a575cb2c8e3
Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>

83 files changed, 4613 insertions, 4348 deletions

diff --git a/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF
index 35c3f3a603..0dc2e73f7a 100644
--- a/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF
@@ -59,7 +59,7 @@ Require-Bundle: org.eclipse.sirius.tests.sample.benchmark,
  org.eclipse.sirius.tree.ui,
  org.eclipse.sirius.tree.ui.ext,
  org.eclipse.core.expressions;bundle-version="3.4.101",
- org.eclipse.sirius.common.acceleo.mtl, 
+ org.eclipse.sirius.common.acceleo.mtl,
  org.eclipse.sirius.common.acceleo.mtl.ide,
  org.eclipse.sirius.query.legacy,
  org.eclipse.sirius.tests.sample.migration,
@@ -71,7 +71,8 @@ Require-Bundle: org.eclipse.sirius.tests.sample.benchmark,
  org.eclipse.platform,
  org.eclipse.sirius.tests.sample.component,
  org.eclipse.sirius.tests.sample.scxml,
- org.eclipse.sirius.tests.sample.component.design
+ org.eclipse.sirius.tests.sample.component.design,
+ org.eclipse.sirius.common.acceleo.aql;bundle-version="3.0.0"
 Bundle-Activator: org.eclipse.sirius.tests.SiriusTestsPlugin
 Eclipse-LazyStart: true
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/sequence/unit/variablesAccess/variablesAccess.odesign b/plugins/org.eclipse.sirius.tests.junit/data/sequence/unit/variablesAccess/variablesAccess.odesign
index af5a458dff..b7bdfb0cc6 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/sequence/unit/variablesAccess/variablesAccess.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/sequence/unit/variablesAccess/variablesAccess.odesign
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_2="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0" name="Interaction" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_2="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0" name="Interaction" version="10.0.0.201505222000">
   <ownedViewpoints name="Interactions" label="Interactions" modelFileExtension="interactions">
     <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" name="Sequence Diagram Example with Combined Fragments Support" label="Sequence Diagram with Combined Fragments" titleExpression="Sequence Diagram with Combined Fragments on &lt;%name%>" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
+    <metamodel href="http://www.eclipse.org/sirius/sample/interactions#/"/>
       <defaultLayer name="Default">
-        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="&lt;%participants%>" semanticElements="var:self" domainClass="interactions.Participant">
+        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="aql:self.participants" semanticElements="var:self" domainClass="interactions.Participant">
           <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Lifeline" semanticCandidatesExpression="var:self" semanticElements="var:self" domainClass="interactions.Participant" startingEndFinderExpression="var:self" finishingEndFinderExpression="var:self">
-            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.1/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(Execution).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(Execution).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(Execution).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(ExecutionEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(ExecutionEnd).execution)->asSet()" semanticElements="&lt;%self + start + end + owner%>" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.1/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(Execution).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(Execution).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(Execution).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(ExecutionEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(ExecutionEnd).execution)->asSet()" semanticElements="&lt;%self + start + end + owner%>" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="" resizeKind="NORTH_SOUTH" width="2" height="5" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Interpolated%20blue%20for%20Executions']">
                 <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']"/>
               </style>
             </borderedNodeMappings>
-            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(State).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(State).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(State).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(StateEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(StateEnd).state)->asSet()" semanticElements="&lt;%self + start + end + owner%>" domainClass="interactions.State" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(State).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(State).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(State).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(StateEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(StateEnd).state)->asSet()" semanticElements="&lt;%self + start + end + owner%>" domainClass="interactions.State" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']" labelPosition="node" resizeKind="NORTH_SOUTH" color="//@userColorsPalettes[name='Skyblue']/@entries[name='High_Skyblue']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
             </borderedNodeMappings>
             <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="EOL" preconditionExpression="&lt;%eContainer(&quot;Interaction&quot;).messages.filter(&quot;DestroyParticipantMessage&quot;).receivingEnd[context == current(&quot;Participant&quot;)]%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20EndOfLife']" semanticCandidatesExpression="var:self" semanticElements="var:self" domainClass="interactions.Participant">
-              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
+              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
@@ -33,21 +34,22 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelSize="12" labelFormat="bold" showIcon="false" labelExpression="&lt;%name%> : &lt;%type.name%>" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
+          <style xsi:type="style:SquareDescription" labelSize="12" showIcon="false" labelExpression="aql:self.name + ' : ' + self.type.name" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="ocl: Sequence{self,  self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl : let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self,  self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl : let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/>
             <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%> (read &lt;%getReceivingContext.currentParticipant.name%>.&lt;%feature.name%>)">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%isWrite%>">
-            <style sizeComputationExpression="&lt;%2%>">
+          <conditionnalStyles predicateExpression="aql:self.isWrite">
+            <style sizeComputationExpression="2">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/>
               <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%> (write &lt;%getReceivingContext.currentParticipant.name%>.&lt;%feature.name%>)">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -55,40 +57,40 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="ocl: Sequence{self,  self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self,  self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%> (call &lt;%getReceivingContext.currentParticipant.name%>.&lt;%operation.name%>)">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%> (new &lt;%receivingEnd.context.name%>)">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="ocl: Sequence{self,  self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self,  self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="ocl: Sequence{self,  self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
-          <style lineStyle="dot">
+        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self,  self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution =  _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution =  _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
+          <style lineStyle="dot" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" domainClass="interactions.InteractionUse" startingEndFinderExpression="&lt;%startingEnd%>" finishingEndFinderExpression="&lt;%finish%>" coveredLifelinesExpression="&lt;%coveredParticipants%>" centerLabelExpression="call(&lt;%interaction.name%>)">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%type%>" labelAlignment="LEFT">
+        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" domainClass="interactions.InteractionUse" startingEndFinderExpression="aql:self.startingEnd" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants" centerLabelExpression="aql:'call(' + self.interaction.name + ')'">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.type" labelAlignment="LEFT">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -96,11 +98,11 @@
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
-        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self%" domainClass="interactions.CombinedFragment" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%finish%>" coveredLifelinesExpression="&lt;%coveredParticipants%>">
-          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="&lt;%ownedOperands%>" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="ocl : let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e.oclIsKindOf(OperandEnd) or e.oclIsKindOf(CombinedFragmentEnd)) in let indexOfOperandEnd : Integer = _ends->indexOf(self.start) in let nextEnd : AbstractEnd = _ends->subSequence(indexOfOperandEnd+1, _ends->size())->first() in nextEnd">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
+        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self%" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants">
+          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="ocl : let _ends : Sequence(AbstractEnd) =  Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e.oclIsKindOf(OperandEnd) or e.oclIsKindOf(CombinedFragmentEnd)) in let indexOfOperandEnd : Integer = _ends->indexOf(self.start) in let nextEnd : AbstractEnd = _ends->subSequence(indexOfOperandEnd+1, _ends->size())->first() in nextEnd">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="&lt;%operator%>" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
@@ -137,17 +139,17 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="ocl: if $container.oclIsTypeOf(Participant) then $container else if  $container.oclIsTypeOf(Execution) then $container.oclAsType(Execution).owner else null endif endif"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="startingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="finishingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -157,23 +159,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:finishingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:startingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new execution position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.0/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -187,12 +189,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -209,7 +211,7 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
@@ -227,23 +229,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -256,7 +258,7 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
@@ -274,23 +276,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -303,13 +305,13 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Write Feature Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
@@ -327,23 +329,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -356,10 +358,10 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
@@ -378,23 +380,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -407,7 +409,7 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
@@ -425,23 +427,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new return message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -453,11 +455,11 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_' + arg0"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + arg0"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -468,12 +470,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -488,48 +490,48 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg"/>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if  $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if  $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if  $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if  $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if  $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -547,13 +549,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -587,31 +589,31 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg"/>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if  $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if  $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if  $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
@@ -629,13 +631,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -660,7 +662,7 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" containerViewExpression="var:targetView"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
@@ -679,23 +681,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -708,22 +710,22 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="IU creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUse" referenceName="interactionUses" variableName="newIU">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="ref.&lt;%eContainer.eContents.filter(&quot;InteractionUse&quot;).nSize%>"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="aql:'ref.' + self.eContainer().eContents()->filter(InteractionUse)->size()"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="aql:self.eContainerOrSelf(Interaction)"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="startingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="finishingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
@@ -734,13 +736,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust interaction use position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
@@ -765,10 +767,10 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%finish%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.finish">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -781,10 +783,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="CF creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragment" referenceName="combinedFragments" variableName="newCF">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operator" valueExpression="alt.&lt;%eContainer.eContents.filter(&quot;CombinedFragment&quot;).nSize%>"/>
@@ -794,15 +796,15 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="startCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="finishCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newCF">
@@ -816,19 +818,19 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move newOpEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startCF" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -849,17 +851,17 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteCombinedFragment()%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteCombinedFragment()"/>
             </initialOperation>
           </ownedTools>
           <ownedTools xsi:type="tool_2:OperandCreationTool" name="Operand" precondition="&lt;%$source!=null &amp;&amp; $target!=null &amp;&amp; $sourceView!=null &amp;&amp; $targetView!=null $startingEndPredecessor !=null &amp;&amp; $finishingEndPredecessor !=null %>" containerMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@containerMappings[name='Combined%20Fragment']/@subContainerMappings[name='Operand']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Operand Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;CombinedFragment&quot;)%>">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand">
@@ -867,7 +869,7 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newOperand">
@@ -877,10 +879,10 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move operand" id="org.eclipse.sirius.business.api.action.moveElement">
-                  <parameters name="referenceOwner" value="&lt;%$newOperand.eContainer%>"/>
+                  <parameters name="referenceOwner" value="aql:newOperand.eContainer()"/>
                   <parameters name="referenceName" value="ownedOperands"/>
                   <parameters name="element" value="var:newOperand"/>
                   <parameters name="predecessor" value="&lt;%(($newOperand.start.precedingSibling.nReverse.filter(&quot;OperandEnd&quot;) &amp;&amp; $newOperand.eContainer.ownedOperands.start).nFirst).owner%>"/>
@@ -904,7 +906,7 @@
               <elementView name="elementView"/>
               <containerView name="containerView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteOperand()%>"/>
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteOperand()"/>
               </initialOperation>
             </ownedTools>
           </subSections>
@@ -917,19 +919,19 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Execution creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="ocl: if $container.oclIsTypeOf(Participant) then $container else if  $container.oclIsTypeOf(Execution) then $container.oclAsType(Execution).owner else null endif endif"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="finishingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -939,23 +941,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:finishingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:startingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.1/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="s&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="'s' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%state.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +  self.state.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%state.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +  self.state.name"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -975,12 +977,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -996,115 +998,115 @@
             <finishingEndPredecessorAfter name="finishingEndPredecessorAfter"/>
             <onEventMovedOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Execution&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Execution)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust execution position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="executions"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.ExecutionEnd&quot;)[current.execution.start == current].nLast.execution%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;State&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(State)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust state position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="states"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.StateEnd&quot;)[current.state.start == current].nLast.state%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Message&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Message)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sending end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.sendingEnd%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.sendingEnd"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receiving end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.receivingEnd%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.receivingEnd"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust message position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="messages"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.sendingEnd.precedingSibling.filter(&quot;interactions.MessageEnd&quot;)[current.message.receivingEnd == current].nLast.message%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;InteractionUse&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(InteractionUse)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Interaction Use position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="interactionUses"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.InteractionUseEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;CombinedFragment&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(CombinedFragment)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust CombinedFragment position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="combinedFragments"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.CombinedFragmentEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Operand&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Operand)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Operand position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;CombinedFragment&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainer(CombinedFragment)"/>
                     <parameters name="referenceName" value="ownedOperands"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.OperandEnd&quot;)[current.owner.start == current &amp;&amp; current(1).eContainer(&quot;interactions.CombinedFragment&quot;) == current().owner.eContainer(&quot;interactions.CombinedFragment&quot;)].nLast.owner%>"/>
@@ -1130,7 +1132,7 @@
     <entries xsi:type="description:UserFixedColor" red="126" green="206" blue="202" name="Seabluff"/>
     <entries xsi:type="description:UserFixedColor" red="160" green="222" blue="214" name="Paleolitico"/>
     <entries xsi:type="description:UserFixedColor" red="199" green="237" blue="232" name="Glint on the ocean"/>
-    <entries xsi:type="description:InterpolatedColor" name="Interpolated blue for Executions" colorValueComputationExpression="&lt;%computeExecutionDepth()%>">
+    <entries xsi:type="description:InterpolatedColor" name="Interpolated blue for Executions" colorValueComputationExpression="aql:self.computeExecutionDepth()">
       <colorSteps associatedValue="0" associatedColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Glint%20on%20the%20ocean']"/>
       <colorSteps associatedValue="10" associatedColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']"/>
     </entries>
@@ -1140,7 +1142,7 @@
     <entries xsi:type="description:UserFixedColor" red="166" green="227" blue="187" name="Watery Green"/>
     <entries xsi:type="description:UserFixedColor" red="186" green="250" blue="158" name="Gentler Spring"/>
     <entries xsi:type="description:UserFixedColor" red="16" green="120" blue="103" name="Flabber Green"/>
-    <entries xsi:type="description:InterpolatedColor" name="Interpolated green for Combined Fragments" colorValueComputationExpression="&lt;%computeCombinedFragmentDepth()%>">
+    <entries xsi:type="description:InterpolatedColor" name="Interpolated green for Combined Fragments" colorValueComputationExpression="aql:self.computeCombinedFragmentDepth()">
       <colorSteps associatedValue="0" associatedColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']"/>
       <colorSteps associatedValue="5" associatedColor="//@userColorsPalettes[name='Greens']/@entries[name='Flabber%20Green']"/>
     </entries>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tables.odesign b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tables.odesign
index 788a8e6c3a..d9571c0bcb 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tables.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tables.odesign
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="UML2 Tables tests" version="10.0.0.201411061000">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="UML2 Tables tests" version="10.0.0.201505222000">
   <ownedViewpoints documentation="Sample of some UML tables " name="UML2 tables for tests" modelFileExtension="uml">
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Colored Classes Table" domainClass="Model">
       <ownedLineMappings name="Model Classes" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Class%20and%20subClass%20with%20some%20attributes']/@ownedRepresentationCreationDescriptions[name='To%20Class%20and%20subClass%20with%20some%20attributes']" domainClass="Class" semanticCandidatesExpression="" headerLabelExpression="Class : &lt;%name%>">
         <defaultForeground>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
         </defaultForeground>
-        <foregroundConditionalStyle predicateExpression="&lt;%isAbstract%>">
+        <foregroundConditionalStyle predicateExpression="aql:self.isAbstract">
           <style labelSize="9">
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </foregroundConditionalStyle>
         <ownedSubLines name="Property" domainClass="Property" headerLabelExpression="Property">
-          <defaultForeground labelSize="8" labelFormat="italic">
+          <defaultForeground labelSize="8">
+            <labelFormat>italic</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </defaultForeground>
           <create name="Create Property">
@@ -27,7 +28,7 @@
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
         </create>
       </ownedLineMappings>
-      <ownedColumnMappings name="name" headerLabelExpression="name" featureName="name" labelExpression="&lt;%name%>">
+      <ownedColumnMappings name="name" headerLabelExpression="name" featureName="name" labelExpression="aql:self.name">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -37,34 +38,37 @@
           </firstModelOperation>
           <mask mask="{0}"/>
         </directEdit>
-        <defaultForeground labelFormat="italic">
+        <defaultForeground>
+          <labelFormat>italic</labelFormat>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </defaultForeground>
-        <foregroundConditionalStyle predicateExpression="&lt;%isAbstract%>">
-          <style labelFormat="bold">
+        <foregroundConditionalStyle predicateExpression="aql:self.isAbstract">
+          <style>
+            <labelFormat>bold</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </foregroundConditionalStyle>
       </ownedColumnMappings>
-      <ownedColumnMappings name="isAbstract" headerLabelExpression="isAbstract ?" featureName="isAbstract" labelExpression="&lt;%isAbstract%>">
-        <backgroundConditionalStyle predicateExpression="&lt;%isAbstract%>">
+      <ownedColumnMappings name="isAbstract" headerLabelExpression="isAbstract ?" featureName="isAbstract" labelExpression="aql:self.isAbstract">
+        <backgroundConditionalStyle predicateExpression="aql:self.isAbstract">
           <style>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           </style>
         </backgroundConditionalStyle>
       </ownedColumnMappings>
-      <ownedColumnMappings name="is Active mapping" headerLabelExpression="Active ?" featureName="isActive" labelExpression="&lt;%isActive%>">
-        <foregroundConditionalStyle predicateExpression="&lt;%isActive%>">
-          <style labelSize="14" labelFormat="italic">
+      <ownedColumnMappings name="is Active mapping" headerLabelExpression="Active ?" featureName="isActive" labelExpression="aql:self.isActive">
+        <foregroundConditionalStyle predicateExpression="aql:self.isActive">
+          <style labelSize="14">
+            <labelFormat>italic</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           </style>
         </foregroundConditionalStyle>
       </ownedColumnMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="Model Association Cross Table" domainClass="Model">
-      <ownedLineMappings name="CT Classes" domainClass="Class" headerLabelExpression="&lt;%name%>"/>
-      <ownedColumnMappings name="CT Classes Column" headerLabelExpression="&lt;%name%>" domainClass="Class"/>
-      <intersection name="Associations" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20Association%20Cross%20Table']/@ownedLineMappings[name='CT%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20Association%20Cross%20Table']/@ownedColumnMappings.0" labelExpression="&lt;%name%>" useDomainClass="true" columnFinderExpression="&lt;%memberEnd.nGet(1).type%>" lineFinderExpression="&lt;%memberEnd.nGet(0).type%>" domainClass="Association">
+      <ownedLineMappings name="CT Classes" domainClass="Class" headerLabelExpression="aql:self.name"/>
+      <ownedColumnMappings name="CT Classes Column" headerLabelExpression="aql:self.name" domainClass="Class"/>
+      <intersection name="Associations" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20Association%20Cross%20Table']/@ownedLineMappings[name='CT%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20Association%20Cross%20Table']/@ownedColumnMappings.0" labelExpression="aql:self.name" useDomainClass="true" columnFinderExpression="aql:self.memberEnd->at(2).type" lineFinderExpression="aql:self.memberEnd->first().type" domainClass="Association">
         <create name="New association">
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
           <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/>
@@ -81,30 +85,30 @@
       </intersection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="All Types and Instance" domainClass="Model">
-      <ownedLineMappings name="All EClasses" domainClass="EClass" semanticCandidatesExpression="&lt;%eAllContents().eClass.minimize.sort%>" headerLabelExpression="&lt;%name%>">
-        <ownedSubLines name="Instances" domainClass="EObject" semanticCandidatesExpression="&lt;%$root.eAllContents($container.name)%>" headerLabelExpression="&lt;%name%>"/>
+      <ownedLineMappings name="All EClasses" domainClass="EClass" semanticCandidatesExpression="&lt;%eAllContents().eClass.minimize.sort%>" headerLabelExpression="aql:self.name">
+        <ownedSubLines name="Instances" domainClass="EObject" semanticCandidatesExpression="&lt;%$root.eAllContents($container.name)%>" headerLabelExpression="aql:self.name"/>
       </ownedLineMappings>
       <ownedColumnMappings name="Instances count" headerLabelExpression="Count" featureName="Count" labelExpression="&lt;%$container.filter(&quot;EClass&quot;).$root.eAllContents($container.name).nSize%>"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="Model Generalization Cross Table" domainClass="Model">
-      <ownedLineMappings name="CT Generalization Classes" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="&lt;%name%>">
+      <ownedLineMappings name="CT Generalization Classes" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="aql:self.name">
         <create name="Create Line Class">
           <variables name="root" documentation="The semantic element of the table."/>
           <variables name="element" documentation="The semantic currently edited element."/>
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
-          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer()%>">
+          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element.eContainer()">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="&quot;&quot;">
               <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="ClassLine&lt;%$element.eContainer().ownedType.nSize%>"/>
             </subModelOperations>
           </firstModelOperation>
         </create>
       </ownedLineMappings>
-      <ownedColumnMappings name="CT Generalization Classes Column" headerLabelExpression="&lt;%name%>" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>">
+      <ownedColumnMappings name="CT Generalization Classes Column" headerLabelExpression="aql:self.name" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>">
         <create name="Create Column Class">
           <variables name="root" documentation="The semantic element of the table."/>
           <variables name="element" documentation="The semantic currently edited element."/>
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
-          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer()%>">
+          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element.eContainer()">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="&quot;&quot;">
               <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="ClassColumn&lt;%$element.eContainer().ownedType.nSize%>"/>
             </subModelOperations>
@@ -147,17 +151,17 @@
       </intersection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Class and subClass with some attributes" initialisation="true" domainClass="Model">
-      <ownedRepresentationCreationDescriptions xsi:type="description_1:TableCreationDescription" name="To Class and subClass with some attributes" browseExpression="&lt;%getRootContainer()%>" tableDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Class%20and%20subClass%20with%20some%20attributes']">
+      <ownedRepresentationCreationDescriptions xsi:type="description_1:TableCreationDescription" name="To Class and subClass with some attributes" browseExpression="aql:self.eResource().getContents()->first()" tableDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Class%20and%20subClass%20with%20some%20attributes']">
         <containerViewVariable name="containerView"/>
         <representationNameVariable name="tableName"/>
       </ownedRepresentationCreationDescriptions>
       <ownedLineMappings name="Class lines" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']/@toolSection/@ownedTools[name='Test%20Diagram']" navigationDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']/@toolSection/@ownedTools[name='Test%20Diagram%20Navigation']" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;)[generalization == null]%>" headerLabelExpression="">
-        <ownedSubLines name="SubClass lines" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="&lt;%name%>">
-          <create documentation="Create a concrete subclass (only for abstract class)" name="Create concrete subclass" precondition="&lt;%isAbstract%>">
+        <ownedSubLines name="SubClass lines" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="aql:self.name">
+          <create documentation="Create a concrete subclass (only for abstract class)" name="Create concrete subclass" precondition="aql:self.isAbstract">
             <variables name="root" documentation="The semantic element of the table."/>
             <variables name="element" documentation="The currently edited element."/>
             <variables name="container" documentation="The semantic element corresponding to the view container."/>
-            <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer()%>">
+            <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element.eContainer()">
               <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="&quot;&quot;">
                 <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="SubclassOf&lt;%$element.name%>&lt;%$element.eContainer().ownedType.nSize%>"/>
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="Generalization" referenceName="generalization" variableName="&quot;&quot;">
@@ -195,7 +199,7 @@
           <variables name="root" documentation="The semantic element of the table."/>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
-          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer()%>">
+          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element.eContainer()">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="&quot;&quot;">
               <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Class&lt;%$element.eContainer().ownedType.nSize%>"/>
             </subModelOperations>
@@ -205,13 +209,13 @@
           <variables name="root" documentation="The semantic element of the table."/>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
-          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer()%>">
+          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element.eContainer()">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="&quot;&quot;">
               <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="OtherClass&lt;%$element.eContainer().ownedType.nSize%>"/>
             </subModelOperations>
           </firstModelOperation>
         </create>
-        <create documentation="Create a concrete subclass (only for abstract class)" name="Create concrete subclass" precondition="&lt;%isAbstract%>">
+        <create documentation="Create a concrete subclass (only for abstract class)" name="Create concrete subclass" precondition="aql:self.isAbstract">
           <variables name="root" documentation="The semantic element of the table."/>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
@@ -228,7 +232,7 @@
           <variables name="element" documentation="The currently edited element."/>
           <variables name="root" documentation="The semantic element corresponding to the current table."/>
           <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer%>">
-            <subModelOperations xsi:type="tool:For" expression="&lt;%ownedType%>">
+            <subModelOperations xsi:type="tool:For" expression="aql:self.ownedType">
               <subModelOperations xsi:type="tool:RemoveElement"/>
             </subModelOperations>
           </firstModelOperation>
@@ -251,12 +255,12 @@
         <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:element">
           <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="newClass">
             <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="AbstractClass&lt;%$element.ownedType.nSize%>"/>
-            <subModelOperations xsi:type="tool:SetValue" featureName="isAbstract" valueExpression="&lt;%true%>"/>
+            <subModelOperations xsi:type="tool:SetValue" featureName="isAbstract" valueExpression="aql:true"/>
           </subModelOperations>
         </firstModelOperation>
       </ownedCreateLine>
-      <ownedColumnMappings name="Class name" headerLabelExpression="Name" initialWidth="200" canEdit="&lt;%isAbstract%>" featureName="name" labelExpression="&lt;%name%>"/>
-      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="&lt;%isAbstract%>"/>
+      <ownedColumnMappings name="Class name" headerLabelExpression="Name" initialWidth="200" canEdit="aql:self.isAbstract" featureName="name" labelExpression="aql:self.name"/>
+      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="aql:self.isAbstract"/>
       <ownedColumnMappings name="Visibility of class" headerLabelExpression="Visibility" featureName="visibility" labelExpression="&lt;%visibility%>"/>
       <ownedColumnMappings name="CollaborationUse" headerLabelExpression="Representation" featureName="representation" labelExpression=""/>
       <ownedColumnMappings name="OwnedUseCase" headerLabelExpression="OwnedUseCase" featureName="ownedUseCase" labelExpression=""/>
@@ -288,7 +292,7 @@
           <mask mask="{0}"/>
         </directEdit>
       </ownedColumnMappings>
-      <ownedColumnMappings name="Commentaire" headerLabelExpression="Comment" featureName="body" labelExpression="&lt;%body%>" featureParentExpression="&lt;%ownedComment%>">
+      <ownedColumnMappings name="Commentaire" headerLabelExpression="Comment" featureName="body" labelExpression="aql:self.body" featureParentExpression="aql:self.ownedComment">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -297,7 +301,7 @@
             <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%!(ownedComment)%>">
               <subModelOperations xsi:type="tool:CreateInstance" typeName="Comment" referenceName="ownedComment" variableName="newComment"/>
             </subModelOperations>
-            <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%ownedComment%>">
+            <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.ownedComment">
               <subModelOperations xsi:type="tool:SetValue" featureName="body" valueExpression="var:arg0"/>
             </subModelOperations>
           </firstModelOperation>
@@ -306,7 +310,7 @@
       </ownedColumnMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:DiagramDescription" name="Just for test navigation" domainClass="Model">
-      <nodeMappings name="Package" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Class%20and%20subClass%20with%20some%20attributes']/@ownedRepresentationCreationDescriptions[name='To%20Class%20and%20subClass%20with%20some%20attributes']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%packagedElement%>" domainClass="Package">
+      <nodeMappings name="Package" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Class%20and%20subClass%20with%20some%20attributes']/@ownedRepresentationCreationDescriptions[name='To%20Class%20and%20subClass%20with%20some%20attributes']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self.packagedElement" domainClass="Package">
         <style xsi:type="style:EllipseNodeDescription">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -314,7 +318,7 @@
         </style>
       </nodeMappings>
       <toolSection name="navigation">
-        <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="Test Diagram" browseExpression="&lt;%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']">
+        <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="Test Diagram" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']">
           <initialOperation/>
           <containerViewVariable name="containerView"/>
           <representationNameVariable name="diagramName"/>
@@ -323,7 +327,7 @@
           <containerViewVariable name="containerView"/>
           <representationNameVariable name="tableName"/>
         </ownedTools>
-        <ownedTools xsi:type="tool_1:DiagramNavigationDescription" name="Test Diagram Navigation" browseExpression="&lt;%getRootContainer()%>" navigationNameExpression="" diagramDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']">
+        <ownedTools xsi:type="tool_1:DiagramNavigationDescription" name="Test Diagram Navigation" browseExpression="aql:self.eResource().getContents()->first()" navigationNameExpression="" diagramDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']">
           <containerViewVariable name="containerView"/>
           <containerVariable name="container"/>
           <representationNameVariable name="diagramName"/>
@@ -331,15 +335,15 @@
       </toolSection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="Model all associations" domainClass="Model">
-      <ownedRepresentationCreationDescriptions xsi:type="description_1:TableCreationDescription" name="To model all associations" browseExpression="&lt;%getRootContainer()%>" tableDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']">
+      <ownedRepresentationCreationDescriptions xsi:type="description_1:TableCreationDescription" name="To model all associations" browseExpression="aql:self.eResource().getContents()->first()" tableDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']">
         <containerViewVariable name="containerView"/>
         <representationNameVariable name="tableName"/>
       </ownedRepresentationCreationDescriptions>
-      <ownedLineMappings name="Line Classes" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="&lt;%name%>">
-        <ownedSubLines name="Associations" domainClass="Association" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Association&quot;)[memberEnd.nGet(0).type == $container]%>" headerLabelExpression="&lt;%name%>"/>
+      <ownedLineMappings name="Line Classes" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="aql:self.name">
+        <ownedSubLines name="Associations" domainClass="Association" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Association&quot;)[memberEnd.nGet(0).type == $container]%>" headerLabelExpression="aql:self.name"/>
       </ownedLineMappings>
-      <ownedColumnMappings name="Column Classes" headerLabelExpression="&lt;%name%>" domainClass="Class"/>
-      <intersection name="Associations" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedLineMappings[name='Line%20Classes']/@ownedSubLines[name='Associations']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedColumnMappings.0" labelExpression="&lt;%name%>" columnFinderExpression="&lt;%if (memberEnd) {%>&lt;%memberEnd.nGet(1).type%>&lt;%}%>" lineFinderExpression="" semanticCandidatesExpression="" domainClass="" preconditionExpression="">
+      <ownedColumnMappings name="Column Classes" headerLabelExpression="aql:self.name" domainClass="Class"/>
+      <intersection name="Associations" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedLineMappings[name='Line%20Classes']/@ownedSubLines[name='Associations']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedColumnMappings.0" labelExpression="aql:self.name" columnFinderExpression="&lt;%if (memberEnd) {%>&lt;%memberEnd.nGet(1).type%>&lt;%}%>" lineFinderExpression="" semanticCandidatesExpression="" domainClass="" preconditionExpression="">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -351,7 +355,7 @@
           <mask mask="{0}"/>
         </directEdit>
       </intersection>
-      <intersection name="isAtLeastOneAssociation" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedLineMappings[name='Line%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedColumnMappings.0" labelExpression="X" useDomainClass="true" columnFinderExpression="&lt;%if (memberEnd) {%>&lt;%memberEnd.nGet(1).type%>&lt;%}%>" lineFinderExpression="&lt;%memberEnd.nGet(0).type%>" domainClass="Association">
+      <intersection name="isAtLeastOneAssociation" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedLineMappings[name='Line%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedColumnMappings.0" labelExpression="X" useDomainClass="true" columnFinderExpression="&lt;%if (memberEnd) {%>&lt;%memberEnd.nGet(1).type%>&lt;%}%>" lineFinderExpression="aql:self.memberEnd->first().type" domainClass="Association">
         <create name="CreateAssociation">
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
           <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/>
@@ -375,16 +379,16 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Property" domainClass="Model">
       <ownedLineMappings name="Property lines" semanticElements="&lt;%self + lowerValue + upperValue%>" domainClass="Property" semanticCandidatesExpression="" headerLabelExpression="Property &lt;%name%>"/>
-      <ownedColumnMappings name="Property name" headerLabelExpression="Name" canEdit="" featureName="name" labelExpression="&lt;%name%>"/>
+      <ownedColumnMappings name="Property name" headerLabelExpression="Name" canEdit="" featureName="name" labelExpression="aql:self.name"/>
       <ownedColumnMappings name="Property Lower" headerLabelExpression="Lower" canEdit="" featureName="lower" labelExpression="&lt;%lower%>"/>
       <ownedColumnMappings name="Property Upper" headerLabelExpression="Upper" featureName="upper" labelExpression="&lt;%upper%>"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="Cross Table Colors" domainClass="Model">
-      <ownedLineMappings name="Line Color Classes" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedRepresentationCreationDescriptions[name='To%20model%20all%20associations']" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="&lt;%name%>">
+      <ownedLineMappings name="Line Color Classes" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedRepresentationCreationDescriptions[name='To%20model%20all%20associations']" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="aql:self.name">
         <defaultForeground>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </defaultForeground>
-        <ownedSubLines name="Properties Color" domainClass="Property" headerLabelExpression="&lt;%name%>">
+        <ownedSubLines name="Properties Color" domainClass="Property" headerLabelExpression="aql:self.name">
           <defaultForeground>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
           </defaultForeground>
@@ -395,7 +399,7 @@
           </defaultBackground>
         </ownedSubLines>
       </ownedLineMappings>
-      <ownedColumnMappings name="Column Color Classes" headerLabelExpression="&lt;%name%>" domainClass="Class">
+      <ownedColumnMappings name="Column Color Classes" headerLabelExpression="aql:self.name" domainClass="Class">
         <defaultForeground>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
         </defaultForeground>
@@ -403,14 +407,15 @@
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
         </defaultBackground>
       </ownedColumnMappings>
-      <ownedColumnMappings name="Property  Column Color" headerLabelExpression="&lt;%name%>" domainClass="Property" semanticCandidatesExpression="&lt;%eAllContents(&quot;Property&quot;).nFirst%>">
+      <ownedColumnMappings name="Property  Column Color" headerLabelExpression="aql:self.name" domainClass="Property" semanticCandidatesExpression="&lt;%eAllContents(&quot;Property&quot;).nFirst%>">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
         </defaultBackground>
       </ownedColumnMappings>
-      <intersection name="Associations Color" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedLineMappings[name='Line%20Color%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedColumnMappings.0" labelExpression="&lt;%name%>" useDomainClass="true" columnFinderExpression="&lt;%memberEnd.nFirst.type%>" lineFinderExpression="&lt;%memberEnd.nLast.type%>" semanticCandidatesExpression="" domainClass="Association" preconditionExpression="">
+      <intersection name="Associations Color" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedLineMappings[name='Line%20Color%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedColumnMappings.0" labelExpression="aql:self.name" useDomainClass="true" columnFinderExpression="&lt;%memberEnd.nFirst.type%>" lineFinderExpression="&lt;%memberEnd.nLast.type%>" semanticCandidatesExpression="" domainClass="Association" preconditionExpression="">
         <foregroundConditionalStyle predicateExpression="&lt;%isLeaf%>">
-          <style labelFormat="bold">
+          <style>
+            <labelFormat>bold</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           </style>
         </foregroundConditionalStyle>
@@ -420,37 +425,37 @@
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
         </defaultBackground>
       </intersection>
-      <intersection name="Extends colors" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedLineMappings[name='Line%20Color%20Classes']/@ownedSubLines[name='Generalization%20colors']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedColumnMappings.0" labelExpression="extend" columnFinderExpression="&lt;%general%>"/>
+      <intersection name="Extends colors" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedLineMappings[name='Line%20Color%20Classes']/@ownedSubLines[name='Generalization%20colors']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedColumnMappings.0" labelExpression="extend" columnFinderExpression="aql:self.general"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Simple hierarchy" domainClass="Model">
       <ownedLineMappings name="Class lines" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;)[generalization == null]%>" headerLabelExpression="">
-        <ownedSubLines name="SubClass lines" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="&lt;%name%>">
-          <ownedSubLines name="SubClass lines 2" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="&lt;%name%>"/>
+        <ownedSubLines name="SubClass lines" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="aql:self.name">
+          <ownedSubLines name="SubClass lines 2" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="aql:self.name"/>
         </ownedSubLines>
       </ownedLineMappings>
-      <ownedColumnMappings name="Class name" headerLabelExpression="Name" initialWidth="200" canEdit="&lt;%isAbstract%>" featureName="name" labelExpression="&lt;%name%>"/>
-      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="&lt;%isAbstract%>"/>
+      <ownedColumnMappings name="Class name" headerLabelExpression="Name" initialWidth="200" canEdit="aql:self.isAbstract" featureName="name" labelExpression="aql:self.name"/>
+      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="aql:self.isAbstract"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Reused hierarchy" domainClass="Model">
-      <ownedLineMappings name="Reused package lines" domainClass="Package" semanticCandidatesExpression="&lt;%packagedElement%>">
-        <ownedSubLines name="Class lines" domainClass="Class" semanticCandidatesExpression="&lt;%packagedElement%>" headerLabelExpression=""/>
+      <ownedLineMappings name="Reused package lines" domainClass="Package" semanticCandidatesExpression="aql:self.packagedElement">
+        <ownedSubLines name="Class lines" domainClass="Class" semanticCandidatesExpression="aql:self.packagedElement" headerLabelExpression=""/>
       </ownedLineMappings>
-      <ownedColumnMappings name="Name" headerLabelExpression="Name" initialWidth="200" canEdit="&lt;%isAbstract%>" featureName="name" labelExpression="&lt;%name%>"/>
-      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="&lt;%isAbstract%>"/>
+      <ownedColumnMappings name="Name" headerLabelExpression="Name" initialWidth="200" canEdit="aql:self.isAbstract" featureName="name" labelExpression="aql:self.name"/>
+      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="aql:self.isAbstract"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="VariablesAccess" domainClass="Model">
-      <ownedLineMappings name="VA_LineClasses" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="&lt;%name%>"/>
-      <ownedColumnMappings name="VA_ColumnClasses" headerLabelExpression="&lt;%name%>" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>"/>
+      <ownedLineMappings name="VA_LineClasses" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="aql:self.name"/>
+      <ownedColumnMappings name="VA_ColumnClasses" headerLabelExpression="aql:self.name" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>"/>
       <intersection name="Generalization" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='VariablesAccess']/@ownedLineMappings[name='VA_LineClasses']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='VariablesAccess']/@ownedColumnMappings.0" labelExpression="&lt;%$line.target.name%> &lt;%$lineSemantic.name%> &lt;%$column.target.name%> &lt;%$columnSemantic.name%>" columnFinderExpression="&lt;%eContents().filter(&quot;Generalization&quot;).general%>"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="TestInitialWidth" domainClass="Model" initialHeaderColumnWidth="200">
       <ownedLineMappings name="Class" domainClass="Class" semanticCandidatesExpression="feature:eContents" headerLabelExpression="Class &lt;%name%>"/>
-      <ownedColumnMappings name="ClassName" headerLabelExpression="Name" initialWidth="250" featureName="&lt;%name%>" labelExpression="&lt;%name%>"/>
-      <ownedColumnMappings name="ClassIsAbstract" headerLabelExpression="isAbstract" initialWidth="100" featureName="isAbstract" labelExpression="&lt;%isAbstract%>"/>
+      <ownedColumnMappings name="ClassName" headerLabelExpression="Name" initialWidth="250" featureName="&lt;%name%>" labelExpression="aql:self.name"/>
+      <ownedColumnMappings name="ClassIsAbstract" headerLabelExpression="isAbstract" initialWidth="100" featureName="isAbstract" labelExpression="aql:self.isAbstract"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="TestColumnWithoutHeaderLabelExpression" domainClass="Model" initialHeaderColumnWidth="200">
       <ownedLineMappings name="Class" domainClass="Class" semanticCandidatesExpression="feature:eContents" headerLabelExpression="Class &lt;%name%>"/>
-      <ownedColumnMappings name="ClassName" headerLabelExpression="" initialWidth="250" featureName="&lt;%name%>" labelExpression="&lt;%name%>"/>
+      <ownedColumnMappings name="ClassName" headerLabelExpression="" initialWidth="250" featureName="&lt;%name%>" labelExpression="aql:self.name"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:DiagramDescription" name="Classes" initialisation="true" domainClass="Model">
       <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/directedit/vp912/vp912.odesign b/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/directedit/vp912/vp912.odesign
index a5694b73dc..ba9bac8cf6 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/directedit/vp912/vp912.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/directedit/vp912/vp912.odesign
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP912" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP912" version="10.0.0.201505222000">
   <ownedViewpoints name="V912" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:TreeDescription" name="TreeWithDirectEdit" label="Tree" domainClass="EPackage">
-      <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" reusedTreeItemMappings="//@ownedViewpoints[name='V912']/@ownedRepresentations[name='TreeWithDirectEdit']/@subItemMappings[name='Class'] //@ownedViewpoints[name='V912']/@ownedRepresentations[name='TreeWithDirectEdit']/@subItemMappings[name='Package']">
+      <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" reusedTreeItemMappings="//@ownedViewpoints[name='V912']/@ownedRepresentations[name='TreeWithDirectEdit']/@subItemMappings[name='Class'] //@ownedViewpoints[name='V912']/@ownedRepresentations[name='TreeWithDirectEdit']/@subItemMappings[name='Package']">
         <defaultStyle>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
@@ -13,13 +13,14 @@
           <root name="root"/>
         </directEdit>
       </subItemMappings>
-      <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
-        <defaultStyle labelFormat="bold" showIcon="false">
+      <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
+        <defaultStyle showIcon="false">
+          <labelFormat>bold</labelFormat>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
         </defaultStyle>
-        <directEdit name="ClassEdit" precondition="&lt;%self.name==&quot;C1&quot;%>" mapping="//@ownedViewpoints[name='V912']/@ownedRepresentations[name='TreeWithDirectEdit']/@subItemMappings[name='Class']">
-          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element_WITH-CUSTOM-NAME%>">
+        <directEdit name="ClassEdit" precondition="aql:self.name = 'C1'" mapping="//@ownedViewpoints[name='V912']/@ownedRepresentations[name='TreeWithDirectEdit']/@subItemMappings[name='Class']">
+          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element_WITH-CUSTOM-NAME">
             <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="var:arg0"/>
           </firstModelOperation>
           <mask mask="{0}"/>
@@ -27,7 +28,7 @@
           <root name="root"/>
         </directEdit>
         <subItemMappings name="Categorie" domainClass="EClass" semanticCandidatesExpression="var:self">
-          <defaultStyle labelExpression="&lt;%name%> Categorie">
+          <defaultStyle labelExpression="aql:self.name + ' Categorie'">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </defaultStyle>
@@ -49,14 +50,15 @@
           </subItemMappings>
         </subItemMappings>
       </subItemMappings>
-      <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>">
-        <defaultStyle labelFormat="italic">
+      <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)">
+        <defaultStyle>
+          <labelFormat>italic</labelFormat>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </defaultStyle>
         <directEdit name="Enum renamming" mapping="//@ownedViewpoints[name='V912']/@ownedRepresentations[name='TreeWithDirectEdit']/@subItemMappings[name='Enum']">
           <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:element">
-            <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="enum&lt;%$0%>"/>
+            <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'enum' + arg0"/>
           </firstModelOperation>
           <mask mask="{0}"/>
           <element name="element"/>
@@ -66,7 +68,7 @@
     </ownedRepresentations>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/refresh/tree.odesign b/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/refresh/tree.odesign
index 31746d9070..d8e26b8bba 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/refresh/tree.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/refresh/tree.odesign
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="10.0.0.201505222000">
   <ownedViewpoints name="Design" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:TreeDescription" name="Tree" label="Tree" domainClass="EPackage">
-      <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" reusedTreeItemMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']">
+      <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" reusedTreeItemMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']">
         <defaultStyle>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -14,13 +14,14 @@
           </defaultStyle>
         </subItemMappings>
       </subItemMappings>
-      <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
-        <defaultStyle labelFormat="bold" showIcon="false">
+      <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
+        <defaultStyle showIcon="false">
+          <labelFormat>bold</labelFormat>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
         </defaultStyle>
         <subItemMappings name="Categorie" domainClass="EClass" semanticCandidatesExpression="var:self">
-          <defaultStyle labelExpression="&lt;%name%> Categorie">
+          <defaultStyle labelExpression="aql:self.name + ' Categorie'">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </defaultStyle>
@@ -64,7 +65,7 @@
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
         </create>
       </subItemMappings>
-      <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>">
+      <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)">
         <defaultStyle>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -75,18 +76,18 @@
   </ownedViewpoints>
   <ownedViewpoints endUserDocumentation="Provides representation to document and review Ecore models." name="Review" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_2:CrossTableDescription" endUserDocumentation="Document the concepts in a package." name="Documentation" titleExpression="Documentation for &lt;%name%> package" domainClass="EPackage">
-      <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="feature:eContents" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
+      <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="feature:eContents" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
         </defaultBackground>
-        <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
+        <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
           <defaultBackground>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </defaultBackground>
         </ownedSubLines>
       </ownedLineMappings>
-      <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="&lt;%getRootContainer%>"/>
-      <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="&lt;%value%>" useDomainClass="true" columnFinderExpression="&lt;%getRootContainer()%>" lineFinderExpression="&lt;%eContainer(&quot;EAnnotation&quot;).eContainer()%>" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;http://www.eclipse.org/emf/2002/GenModel&quot;].details[key==&quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
+      <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/>
+      <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="&lt;%eContainer(&quot;EAnnotation&quot;).eContainer()%>" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;http://www.eclipse.org/emf/2002/GenModel&quot;].details[key==&quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -125,7 +126,7 @@
     </ownedRepresentations>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/tools/tree.odesign b/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/tools/tree.odesign
index d4cf812194..e90692811e 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/tools/tree.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/tools/tree.odesign
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="10.0.0.201505222000">
   <ownedViewpoints name="TreeViewpoint" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:TreeDescription" name="Tree" label="Tree" domainClass="EPackage">
-      <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" reusedTreeItemMappings="//@ownedViewpoints[name='TreeViewpoint']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='TreeViewpoint']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']">
+      <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" reusedTreeItemMappings="//@ownedViewpoints[name='TreeViewpoint']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='TreeViewpoint']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']">
         <defaultStyle>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -14,13 +14,14 @@
           </defaultStyle>
         </subItemMappings>
       </subItemMappings>
-      <subItemMappings name="Class" label="Class" detailDescriptions="//@ownedViewpoints[name='TreeViewpoint']/@ownedRepresentations[name='Tree']/@ownedRepresentationCreationDescriptions[name='Tree%20Creation%20on%20Class']" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
-        <defaultStyle labelFormat="bold" showIcon="false">
+      <subItemMappings name="Class" label="Class" detailDescriptions="//@ownedViewpoints[name='TreeViewpoint']/@ownedRepresentations[name='Tree']/@ownedRepresentationCreationDescriptions[name='Tree%20Creation%20on%20Class']" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
+        <defaultStyle showIcon="false">
+          <labelFormat>bold</labelFormat>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
         </defaultStyle>
         <subItemMappings name="Categorie" domainClass="EClass" semanticCandidatesExpression="var:self">
-          <defaultStyle labelExpression="&lt;%name%> Categorie">
+          <defaultStyle labelExpression="aql:self.name + ' Categorie'">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </defaultStyle>
@@ -67,7 +68,7 @@
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
         </create>
       </subItemMappings>
-      <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>">
+      <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)">
         <defaultStyle>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -99,7 +100,7 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/collapse/tc1412/tc1412.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/collapse/tc1412/tc1412.odesign
index 6d39b0cd5f..80fe2b054d 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/collapse/tc1412/tc1412.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/collapse/tc1412/tc1412.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="tc1412" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="tc1412" version="10.0.0.201505222000">
   <ownedViewpoints name="tc1412" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc1412" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="CollapseAttrRef" label="Collapse attributes and references">
@@ -40,45 +40,45 @@
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%name == &quot;1&quot;%>">
+          <conditionnalStyles predicateExpression="aql:self.name = '1'">
             <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%name == &quot;2&quot;%>">
+          <conditionnalStyles predicateExpression="aql:self.name = '2'">
             <style xsi:type="style:EllipseNodeDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%name == &quot;3&quot;%>">
+          <conditionnalStyles predicateExpression="aql:self.name = '3'">
             <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" strokeSizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%name == &quot;4&quot;%>">
+          <conditionnalStyles predicateExpression="aql:self.name = '4'">
             <style xsi:type="style:BundledImageDescription" shape="triangle">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%name == &quot;5&quot;%>">
-            <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+          <conditionnalStyles predicateExpression="aql:self.name = '5'">
+            <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%name == &quot;6&quot;%>">
+          <conditionnalStyles predicateExpression="aql:self.name = '6'">
             <style xsi:type="style:GaugeCompositeStyleDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <sections maxValueExpression="&lt;%100%>" valueExpression="&lt;%75%>">
+              <sections maxValueExpression="100" valueExpression="75">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
               </sections>
@@ -92,7 +92,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <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']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/ticket2174/tc2174.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/ticket2174/tc2174.odesign
index 93c540834c..a3c7159b99 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/ticket2174/tc2174.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/ticket2174/tc2174.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="description" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="description" version="10.0.0.201505222000">
   <ownedViewpoints endUserDocumentation="2174&#xD;&#xA;" name="tc2174" label="TC2174" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc2174" label="tc2174" titleExpression="tc2174" domainClass="EPackage" enablePopupBars="true">
       <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
@@ -31,29 +31,29 @@
         <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='tc2174']/@ownedRepresentations[name='tc2174']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@borderedNodeMappings[name='EAttributeMapping2']" semanticConditionExpression="&lt;%name != &quot;activateCollapseAtt&quot;%>"/>
       </filters>
       <defaultLayer name="Default" label="default">
-        <containerMappings name="EClassContainerMapping" label="EClassMapping" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <borderedNodeMappings name="EAttributeMapping2" label="EAttributeMapping" semanticCandidatesExpression="&lt;%eAttributes%>" domainClass="EAttribute">
+        <containerMappings name="EClassContainerMapping" label="EClassMapping" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass">
+          <borderedNodeMappings name="EAttributeMapping2" label="EAttributeMapping" semanticCandidatesExpression="aql:self.eAttributes" domainClass="EAttribute">
             <style xsi:type="style:BundledImageDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </borderedNodeMappings>
-          <subNodeMappings name="EOperationMapping3" label="EOperationMapping" semanticCandidatesExpression="&lt;%eOperations%>" domainClass="EOperation">
+          <subNodeMappings name="EOperationMapping3" label="EOperationMapping" semanticCandidatesExpression="aql:self.eOperations" domainClass="EOperation">
             <style xsi:type="style:BundledImageDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <subNodeMappings name="EReferenceMapping3" label="EReferenceMapping" semanticCandidatesExpression="&lt;%eReferences%>" domainClass="EReference">
+          <subNodeMappings name="EReferenceMapping3" label="EReferenceMapping" semanticCandidatesExpression="aql:self.eReferences" domainClass="EReference">
             <style xsi:type="style:BundledImageDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -109,7 +109,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2174']/@ownedRepresentations[name='Diag2399']/@defaultLayer/@nodeMappings[name='EClassNode']" targetMapping="//@ownedViewpoints[name='tc2174']/@ownedRepresentations[name='Diag2399']/@defaultLayer/@nodeMappings[name='EClassNode']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2174']/@ownedRepresentations[name='Diag2399']/@defaultLayer/@nodeMappings[name='EClassNode']" targetMapping="//@ownedViewpoints[name='tc2174']/@ownedRepresentations[name='Diag2399']/@defaultLayer/@nodeMappings[name='EClassNode']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/computelabel/testComputeLabelDiagram.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/computelabel/testComputeLabelDiagram.odesign
index 03abc28b7e..669332ef40 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/computelabel/testComputeLabelDiagram.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/computelabel/testComputeLabelDiagram.odesign
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="10.0.0.201505222000">
   <ownedViewpoints endUserDocumentation="Provides graphical and tabular modelers to design an Ecore model." name="ViewpointTestComputeLabel" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="DiagramTestComputeLabel" titleExpression="&lt;%name%> package entities" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="DiagramTestComputeLabel" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
         <nodeMappings name="Package" domainClass="EPackage">
           <borderedNodeMappings name="subPackage" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage">
-            <style xsi:type="style:EllipseNodeDescription" labelExpression="&lt;%$diagram.name + name%>">
+            <style xsi:type="style:EllipseNodeDescription" labelExpression="aql:diagram.name + self.name">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:LozengeNodeDescription" labelExpression="&lt;%$diagram.name + name%>" resizeKind="NSEW">
+          <style xsi:type="style:LozengeNodeDescription" labelExpression="aql:diagram.name + self.name" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EC_EReference" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='ViewpointTestComputeLabel']/@ownedRepresentations[name='DiagramTestComputeLabel']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='ViewpointTestComputeLabel']/@ownedRepresentations[name='DiagramTestComputeLabel']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='ViewpointTestComputeLabel']/@ownedRepresentations[name='DiagramTestComputeLabel']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='ViewpointTestComputeLabel']/@ownedRepresentations[name='DiagramTestComputeLabel']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <beginLabelStyleDescription labelExpression="&lt;%$diagram.name + name%>">
+            <beginLabelStyleDescription labelExpression="aql:diagram.name + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </beginLabelStyleDescription>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%$diagram.name + name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:diagram.name + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
-            <endLabelStyleDescription labelExpression="&lt;%$diagram.name + name%>">
+            <endLabelStyleDescription labelExpression="aql:diagram.name + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </endLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EC EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <containerMappings name="EC EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%$diagram.name + name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:diagram.name + self.name" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + eParameters%>" domainClass="EOperation">
-            <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="&lt;%$diagram.name + name%>" labelAlignment="LEFT" tooltipExpression="&lt;%name%>(&lt;%eParameters.name.sep(&quot;, &quot;)%>) : &lt;%eType.name%>" sizeComputationExpression="2">
+          <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation">
+            <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:diagram.name + self.name" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%$diagram.name + name%>" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:diagram.name + self.name" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -61,9 +61,9 @@
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%current.cleanInterpreter%>"/>
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.cleanInterpreter()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -75,7 +75,7 @@
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EPackage&lt;%eContainer().eContents().filter(&quot;EPackage&quot;).nSize%>"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%current.cleanInterpreter%>"/>
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.cleanInterpreter()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -90,7 +90,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Attribute"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%current.cleanInterpreter%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.cleanInterpreter()"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -107,7 +107,7 @@
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference&lt;%eContainer(&quot;EClassifier&quot;).eAllContents(&quot;EReference&quot;).nSize%>"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%current.cleanInterpreter%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.cleanInterpreter()"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -117,7 +117,7 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.tests.unit.diagram.compute.variable.Service"/>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/decorators/sprint.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/decorators/sprint.odesign
index 21d4dfccca..1b1dc82baf 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/decorators/sprint.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/decorators/sprint.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="10.0.0.201505222000">
   <ownedViewpoints name="Sprint with UML2 (Modeler test for decorators)" modelFileExtension="uml">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="WithoutDecorationsSet" initialisation="true" domainClass="Package" rootExpression="">
       <defaultLayer name="Sprint">
@@ -26,14 +26,14 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="MappingBasedDecoration" initialisation="true" domainClass="Package" rootExpression="">
       <defaultLayer name="Sprint">
-        <nodeMappings name="Class Diagram mbd" preconditionExpression="&lt;%!name.endsWith(&quot;H&quot;)%>" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
+        <nodeMappings name="Class Diagram mbd" preconditionExpression="aql: not self.name.endsWith('H')" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
           <style xsi:type="style:BundledImageDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="Class Diagram mbdh" preconditionExpression="&lt;%name.endsWith(&quot;H&quot;)%>" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
+        <nodeMappings name="Class Diagram mbdh" preconditionExpression="aql:self.name.endsWith('H')" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
           <style xsi:type="style:BundledImageDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -48,7 +48,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -64,14 +64,14 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="SemanticBasedDecoration" initialisation="true" domainClass="Package" rootExpression="">
       <defaultLayer name="Sprint">
-        <nodeMappings name="Class Diagram sbd" preconditionExpression="&lt;%!name.endsWith(&quot;H&quot;)%>" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
+        <nodeMappings name="Class Diagram sbd" preconditionExpression="aql: not self.name.endsWith('H')" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
           <style xsi:type="style:BundledImageDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="Class Diagram sbdh" preconditionExpression="&lt;%name.endsWith(&quot;H&quot;)%>" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
+        <nodeMappings name="Class Diagram sbdh" preconditionExpression="aql:self.name.endsWith('H')" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
           <style xsi:type="style:BundledImageDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -93,7 +93,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -123,14 +123,14 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="SemanticBasedDecorationLayer" initialisation="true" domainClass="Package" rootExpression="">
       <defaultLayer name="Sprint">
-        <nodeMappings name="Class Diagram sbd" preconditionExpression="&lt;%!name.endsWith(&quot;H&quot;)%>" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
+        <nodeMappings name="Class Diagram sbd" preconditionExpression="aql: not self.name.endsWith('H')" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
           <style xsi:type="style:BundledImageDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="Class Diagram sbdh" preconditionExpression="&lt;%name.endsWith(&quot;H&quot;)%>" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
+        <nodeMappings name="Class Diagram sbdh" preconditionExpression="aql:self.name.endsWith('H')" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Class">
           <style xsi:type="style:BundledImageDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/dynamicInstance/component.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/dynamicInstance/component.odesign
index 7e5ba24a53..683761407d 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/dynamicInstance/component.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/dynamicInstance/component.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="10.0.0.201505222000">
   <ownedViewpoints name="Component Viewpoint" modelFileExtension="component">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="ComponentDiagramWithPrefix" domainClass="component.Application">
       <metamodel href="component.ecore#/"/>
@@ -10,7 +10,7 @@
             <beginLabelStyleDescription labelExpression="input">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </beginLabelStyleDescription>
-            <centerLabelStyleDescription labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
             <endLabelStyleDescription labelExpression="output">
@@ -34,14 +34,14 @@
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               </style>
             </borderedNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             </style>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -103,7 +103,7 @@
             <beginLabelStyleDescription labelExpression="input">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </beginLabelStyleDescription>
-            <centerLabelStyleDescription labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
             <endLabelStyleDescription labelExpression="output">
@@ -127,14 +127,14 @@
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               </style>
             </borderedNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             </style>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/editors/traceability/vp1038/vp1038.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/editors/traceability/vp1038/vp1038.odesign
index bf950db380..785bbafded 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/editors/traceability/vp1038/vp1038.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/editors/traceability/vp1038/vp1038.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_3="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="TraceabilityTest" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_3="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="TraceabilityTest" version="10.0.0.201505222000">
   <ownedViewpoints name="Traceability" modelFileExtension="ecore">
     <validationSet>
       <ownedRules xsi:type="validation:SemanticValidationRule" level="WARNING" targetClass="EClass">
@@ -11,30 +11,30 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Traceability']/@ownedRepresentations[name='Trace%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
       </filters>
       <defaultLayer name="Default">
-        <nodeMappings name="NM_EEnum" label="NM_EEnum" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>" domainClass="EEnum">
+        <nodeMappings name="NM_EEnum" label="NM_EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum">
           <style xsi:type="style:EllipseNodeDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EM_Ref" sourceMapping="//@ownedViewpoints[name='Traceability']/@ownedRepresentations[name='Trace%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Traceability']/@ownedRepresentations[name='Trace%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="&lt;%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style routingStyle="manhattan">
+        <edgeMappings name="EM_Ref" sourceMapping="//@ownedViewpoints[name='Traceability']/@ownedRepresentations[name='Trace%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Traceability']/@ownedRepresentations[name='Trace%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style sizeComputationExpression="[eContents()->size()/]" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="CM_EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage">
-          <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage">
+          <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
             <style xsi:type="style:SquareDescription" width="2" height="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <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']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
@@ -73,7 +73,7 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </defaultStyle>
           <subItemMappings name="EAnnotation" domainClass="EAnnotation" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EAnnotation&quot;)%>">
-            <defaultStyle labelExpression="&lt;%source%>">
+            <defaultStyle labelExpression="aql:self.source">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
             </defaultStyle>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/file/test_vsm.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/file/test_vsm.odesign
index c5601a01fc..ec0a77437c 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/file/test_vsm.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/file/test_vsm.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="My" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="My" version="10.0.0.201505222000">
   <ownedViewpoints name="testCollapse">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="testCollapse" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="collapse">
@@ -17,7 +17,7 @@
       <defaultLayer name="Default">
         <containerMappings name="package" semanticCandidatesExpression="var:self" domainClass="EPackage">
           <subContainerMappings name="class" semanticCandidatesExpression="feature:eContents" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@toolSections.0/@ownedTools[name='move%20bordered']">
-            <borderedNodeMappings name="att" semanticCandidatesExpression="&lt;%eAllContents()%>" domainClass="EAttribute">
+            <borderedNodeMappings name="att" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EAttribute">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" sizeComputationExpression="1" resizeKind="NSEW" width="1" height="1">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -31,7 +31,7 @@
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               </style>
             </borderedNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -46,14 +46,14 @@
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               </style>
             </subNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             </style>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -67,26 +67,26 @@
             <element name="element"/>
             <newViewContainer name="newContainerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="[newSemanticContainer/]">
-                <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="[element/]"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[newSemanticContainer/]">
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="[element/]"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createCollapse" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att']">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createCollapse" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
+                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createCollapse2" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att2']">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createCollapse2" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att2']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:CreateInstance" typeName="EOperation" referenceName="eOperations"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
+                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EOperation" referenceName="eOperations"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/filter/collapseExpand/testCollaspeExpand.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/filter/collapseExpand/testCollaspeExpand.odesign
index c5601a01fc..ec0a77437c 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/filter/collapseExpand/testCollaspeExpand.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/filter/collapseExpand/testCollaspeExpand.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="My" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="My" version="10.0.0.201505222000">
   <ownedViewpoints name="testCollapse">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="testCollapse" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="collapse">
@@ -17,7 +17,7 @@
       <defaultLayer name="Default">
         <containerMappings name="package" semanticCandidatesExpression="var:self" domainClass="EPackage">
           <subContainerMappings name="class" semanticCandidatesExpression="feature:eContents" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@toolSections.0/@ownedTools[name='move%20bordered']">
-            <borderedNodeMappings name="att" semanticCandidatesExpression="&lt;%eAllContents()%>" domainClass="EAttribute">
+            <borderedNodeMappings name="att" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EAttribute">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" sizeComputationExpression="1" resizeKind="NSEW" width="1" height="1">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -31,7 +31,7 @@
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               </style>
             </borderedNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -46,14 +46,14 @@
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               </style>
             </subNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             </style>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -67,26 +67,26 @@
             <element name="element"/>
             <newViewContainer name="newContainerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="[newSemanticContainer/]">
-                <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="[element/]"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[newSemanticContainer/]">
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="[element/]"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createCollapse" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att']">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createCollapse" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
+                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createCollapse2" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att2']">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createCollapse2" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att2']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:CreateInstance" typeName="EOperation" referenceName="eOperations"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
+                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EOperation" referenceName="eOperations"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/folding/description/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/folding/description/ecore.odesign
index b6fc952060..d62c051cb8 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/folding/description/ecore.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/folding/description/ecore.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Test Folding style" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Test Folding style" version="10.0.0.201505222000">
   <ownedViewpoints name="DesignTestFoldingStyle" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Package Hierarchy With Nodes Target" domainClass="EPackage">
       <defaultLayer name="Default">
@@ -11,7 +11,7 @@
           </style>
         </nodeMappings>
         <edgeMappings name="NT subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Target']/@defaultLayer/@nodeMappings[name='NT%20Package']" targetMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Target']/@defaultLayer/@nodeMappings[name='NT%20Package']" targetFinderExpression="feature:eContainer" targetExpression="">
-          <style sourceArrow="OutputArrow" targetArrow="Diamond" sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET">
+          <style sourceArrow="OutputArrow" targetArrow="Diamond" routingStyle="tree" foldingStyle="TARGET">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -23,7 +23,7 @@
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Package Hierarchy With Containers Target" domainClass="EPackage">
       <defaultLayer name="Default">
         <edgeMappings name="CT subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Target']/@defaultLayer/@containerMappings[name='CT%20Package']" targetMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Target']/@defaultLayer/@containerMappings[name='CT%20Package']" targetFinderExpression="feature:eContainer" targetExpression="">
-          <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET">
+          <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree" foldingStyle="TARGET">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -31,7 +31,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="CT Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -49,8 +49,8 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="NS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetFinderExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" targetExpression="">
-          <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree" foldingStyle="SOURCE">
+        <edgeMappings name="NS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetFinderExpression="aql:self.eContents()->filter(ecore::EPackage)" targetExpression="">
+          <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree" foldingStyle="SOURCE">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -61,8 +61,8 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Package Hierarchy With Containers Source" domainClass="EPackage">
       <defaultLayer name="Default">
-        <edgeMappings name="CS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetFinderExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" targetExpression="">
-          <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree" foldingStyle="SOURCE">
+        <edgeMappings name="CS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetMapping="//@ownedViewpoints[name='DesignTestFoldingStyle']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetFinderExpression="aql:self.eContents()->filter(ecore::EPackage)" targetExpression="">
+          <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree" foldingStyle="SOURCE">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -70,7 +70,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="CS Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/java_action/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/java_action/ecore.odesign
index b9c90bc97f..b31affb714 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/java_action/ecore.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/java_action/ecore.odesign
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="10.0.0.201505222000">
   <ownedViewpoints name="Design" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="&lt;%name%> package entities" initialisation="true" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" initialisation="true" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <containerMappings name="EC EClass" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='StubDeleteAction']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <containerMappings name="EC EClass" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='StubDeleteAction']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='StubDeleteOtherThanSelectionAction']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
           <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation">
-            <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="&lt;%name%>(&lt;%eParameters.name.sep(&quot;, &quot;)%>) : &lt;%eType.name%>" sizeComputationExpression="2">
+            <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -26,7 +26,7 @@
           </style>
         </containerMappings>
         <toolSections name="Dynamic">
-          <ownedTools xsi:type="tool:ToolDescription" name="StubAction" precondition="&lt;%filter(&quot;EClass&quot;)%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
+          <ownedTools xsi:type="tool:ToolDescription" name="StubAction" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -36,7 +36,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ToolDescription" name="StubActionWithPrecondition" precondition="&lt;%filter(&quot;EClass&quot;)%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
+          <ownedTools xsi:type="tool:ToolDescription" name="StubActionWithPrecondition" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -65,14 +65,14 @@
               <firstModelOperations xsi:type="tool:ExternalJavaAction" name="invoke stub action" id="org.eclipse.sirius.tests.unit.api.tools.stubDeleteOtherThanSelectionJavaActionID"/>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ToolDescription" name="CallStubAction" precondition="&lt;%filter(&quot;EClass&quot;)%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
+          <ownedTools xsi:type="tool:ToolDescription" name="CallStubAction" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ExternalJavaActionCall" name="call call" action="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='StubAction']/@initialOperation/@firstModelOperations"/>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ToolDescription" name="CallStubActionWithPrecondition" precondition="&lt;%filter(&quot;EClass&quot;)%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
+          <ownedTools xsi:type="tool:ToolDescription" name="CallStubActionWithPrecondition" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/2352/2352.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/2352/2352.odesign
index c3a0e86e1c..4504df54cc 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/2352/2352.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/2352/2352.odesign
@@ -1,33 +1,34 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="2352" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="2352" version="10.0.0.201505222000">
   <ownedViewpoints name="2352" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="2352" titleExpression="&lt;%name%> package entities" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="2352" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <containerMappings name="EC EClass Flat" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="EC EClass Flat" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="EC EClass Shape" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:ShapeContainerStyleDescription" labelExpression="&lt;%name%>Shape">
+        <containerMappings name="EC EClass Shape" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.name + 'Shape'">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EC EClass Image" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:WorkspaceImageDescription" labelExpression="&lt;%name%>Image" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+        <containerMappings name="EC EClass Image" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:WorkspaceImageDescription" labelExpression="aql:self.name + 'Image'" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -39,7 +40,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -48,7 +49,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -57,7 +58,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -65,8 +66,8 @@
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Package" activeByDefault="true">
-        <containerMappings name="Design Package" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2352']/@ownedRepresentations[name='2352']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='2352']/@ownedRepresentations[name='2352']/@defaultLayer/@containerMappings[name='EC%20EClass%20Flat']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="Design Package" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2352']/@ownedRepresentations[name='2352']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='2352']/@ownedRepresentations[name='2352']/@defaultLayer/@containerMappings[name='EC%20EClass%20Flat']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -74,7 +75,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Dropped Package" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2352']/@ownedRepresentations[name='2352']/@defaultLayer/@containerMappings[name='EC%20EClass%20Flat']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -88,7 +89,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package">
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:package">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Package &lt;%eContainer().eContents.filter(&quot;EPackage&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -99,7 +100,7 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color">
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]">
       <colorSteps>
         <associatedColor href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
       </colorSteps>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/3.5/My.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/3.5/My.odesign
index ac180708a2..d526855b4c 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/3.5/My.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/3.5/My.odesign
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="MyGroup" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="MyGroup" version="10.0.0.201505222000">
   <ownedViewpoints name="TestLayoutCopy" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType1" titleExpression="DiagType1 of &lt;%name%>" domainClass="EPackage">
-      <edgeMappings name="DT1_EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-        <style sizeComputationExpression="1">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType1" titleExpression="aql:'DiagType1 of ' + self.name" domainClass="EPackage">
+      <edgeMappings name="DT1_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
@@ -18,7 +18,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -26,47 +26,48 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType2" titleExpression="DiagType2 of &lt;%name%>" domainClass="EPackage">
-      <edgeMappings name="DT2_EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-        <style sizeComputationExpression="1">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType2" titleExpression="aql:'DiagType2 of ' + self.name" domainClass="EPackage">
+      <edgeMappings name="DT2_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
       <containerMappings name="DT2_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']">
-        <subContainerMappings name="DT2_Class" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <subContainerMappings name="DT2_Class" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="DT2_Attribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
           <subNodeMappings name="DT2_Operation" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation">
-            <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="&lt;%name%>(&lt;%eParameters.name.sep(&quot;, &quot;)%>) : &lt;%eType.name%>" sizeComputationExpression="2">
+            <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             </style>
           </conditionnalStyles>
         </subContainerMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="Container &lt;%name%>" backgroundStyle="GradientTopToBottom">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" labelExpression="aql:'Container ' + self.name" backgroundStyle="GradientTopToBottom">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -74,18 +75,18 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType3" titleExpression="DiagType3 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType3" titleExpression="aql:'DiagType3 of ' + self.name" domainClass="EPackage">
       <nodeMappings name="DT3_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-        <style xsi:type="style:SquareDescription" labelExpression="Node &lt;%name%>" resizeKind="NSEW">
+        <style xsi:type="style:SquareDescription" labelExpression="aql:'Node ' + self.name" resizeKind="NSEW">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </nodeMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType4" titleExpression="DiagType4 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType4" titleExpression="aql:'DiagType4 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT4_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -93,7 +94,7 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType5" titleExpression="DiagType5 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType5" titleExpression="aql:'DiagType5 of ' + self.name" domainClass="EPackage">
       <nodeMappings name="DT5_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
         <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="1" resizeKind="EAST_WEST">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -102,7 +103,7 @@
         </style>
       </nodeMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType6" titleExpression="DiagType6 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType6" titleExpression="aql:'DiagType6 of ' + self.name" domainClass="EPackage">
       <nodeMappings name="DT6_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
         <borderedNodeMappings name="DT6_ClassInRelation" semanticCandidatesExpression="&lt;%eReferences.eReferenceType%>" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
@@ -117,16 +118,16 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="DT6_EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-        <style sizeComputationExpression="1">
+      <edgeMappings name="DT6_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType7" titleExpression="DiagType7 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType7" titleExpression="aql:'DiagType7 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT7_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']">
         <borderedNodeMappings name="DT7_Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass">
           <style xsi:type="style:DotDescription" resizeKind="NSEW">
@@ -135,7 +136,7 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -143,7 +144,7 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType8" titleExpression="DiagType8 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType8" titleExpression="aql:'DiagType8 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT8_Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage">
         <borderedNodeMappings name="DT8_Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass">
           <style xsi:type="style:DotDescription" resizeKind="EAST_WEST">
@@ -152,7 +153,7 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -160,16 +161,16 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType9" titleExpression="DiagType9 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType9" titleExpression="aql:'DiagType9 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT9_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-        <borderedNodeMappings name="DT9_Class" semanticCandidatesExpression="&lt;%eAllContents()%>" domainClass="EClass">
+        <borderedNodeMappings name="DT9_Class" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EClass">
           <style xsi:type="style:DotDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/3.6/My.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/3.6/My.odesign
index ac180708a2..d526855b4c 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/3.6/My.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/3.6/My.odesign
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="MyGroup" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="MyGroup" version="10.0.0.201505222000">
   <ownedViewpoints name="TestLayoutCopy" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType1" titleExpression="DiagType1 of &lt;%name%>" domainClass="EPackage">
-      <edgeMappings name="DT1_EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-        <style sizeComputationExpression="1">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType1" titleExpression="aql:'DiagType1 of ' + self.name" domainClass="EPackage">
+      <edgeMappings name="DT1_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
@@ -18,7 +18,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -26,47 +26,48 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType2" titleExpression="DiagType2 of &lt;%name%>" domainClass="EPackage">
-      <edgeMappings name="DT2_EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-        <style sizeComputationExpression="1">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType2" titleExpression="aql:'DiagType2 of ' + self.name" domainClass="EPackage">
+      <edgeMappings name="DT2_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
       <containerMappings name="DT2_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']">
-        <subContainerMappings name="DT2_Class" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <subContainerMappings name="DT2_Class" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="DT2_Attribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
           <subNodeMappings name="DT2_Operation" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation">
-            <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="&lt;%name%>(&lt;%eParameters.name.sep(&quot;, &quot;)%>) : &lt;%eType.name%>" sizeComputationExpression="2">
+            <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             </style>
           </conditionnalStyles>
         </subContainerMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="Container &lt;%name%>" backgroundStyle="GradientTopToBottom">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" labelExpression="aql:'Container ' + self.name" backgroundStyle="GradientTopToBottom">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -74,18 +75,18 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType3" titleExpression="DiagType3 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType3" titleExpression="aql:'DiagType3 of ' + self.name" domainClass="EPackage">
       <nodeMappings name="DT3_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-        <style xsi:type="style:SquareDescription" labelExpression="Node &lt;%name%>" resizeKind="NSEW">
+        <style xsi:type="style:SquareDescription" labelExpression="aql:'Node ' + self.name" resizeKind="NSEW">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </nodeMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType4" titleExpression="DiagType4 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType4" titleExpression="aql:'DiagType4 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT4_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -93,7 +94,7 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType5" titleExpression="DiagType5 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType5" titleExpression="aql:'DiagType5 of ' + self.name" domainClass="EPackage">
       <nodeMappings name="DT5_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
         <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="1" resizeKind="EAST_WEST">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -102,7 +103,7 @@
         </style>
       </nodeMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType6" titleExpression="DiagType6 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType6" titleExpression="aql:'DiagType6 of ' + self.name" domainClass="EPackage">
       <nodeMappings name="DT6_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
         <borderedNodeMappings name="DT6_ClassInRelation" semanticCandidatesExpression="&lt;%eReferences.eReferenceType%>" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
@@ -117,16 +118,16 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="DT6_EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-        <style sizeComputationExpression="1">
+      <edgeMappings name="DT6_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType7" titleExpression="DiagType7 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType7" titleExpression="aql:'DiagType7 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT7_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']">
         <borderedNodeMappings name="DT7_Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass">
           <style xsi:type="style:DotDescription" resizeKind="NSEW">
@@ -135,7 +136,7 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -143,7 +144,7 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType8" titleExpression="DiagType8 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType8" titleExpression="aql:'DiagType8 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT8_Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage">
         <borderedNodeMappings name="DT8_Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass">
           <style xsi:type="style:DotDescription" resizeKind="EAST_WEST">
@@ -152,7 +153,7 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -160,16 +161,16 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType9" titleExpression="DiagType9 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType9" titleExpression="aql:'DiagType9 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT9_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-        <borderedNodeMappings name="DT9_Class" semanticCandidatesExpression="&lt;%eAllContents()%>" domainClass="EClass">
+        <borderedNodeMappings name="DT9_Class" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EClass">
           <style xsi:type="style:DotDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign
index ac180708a2..d526855b4c 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="MyGroup" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="MyGroup" version="10.0.0.201505222000">
   <ownedViewpoints name="TestLayoutCopy" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType1" titleExpression="DiagType1 of &lt;%name%>" domainClass="EPackage">
-      <edgeMappings name="DT1_EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-        <style sizeComputationExpression="1">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType1" titleExpression="aql:'DiagType1 of ' + self.name" domainClass="EPackage">
+      <edgeMappings name="DT1_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
@@ -18,7 +18,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -26,47 +26,48 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType2" titleExpression="DiagType2 of &lt;%name%>" domainClass="EPackage">
-      <edgeMappings name="DT2_EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-        <style sizeComputationExpression="1">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType2" titleExpression="aql:'DiagType2 of ' + self.name" domainClass="EPackage">
+      <edgeMappings name="DT2_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
       <containerMappings name="DT2_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']">
-        <subContainerMappings name="DT2_Class" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <subContainerMappings name="DT2_Class" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="DT2_Attribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
           <subNodeMappings name="DT2_Operation" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation">
-            <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="&lt;%name%>(&lt;%eParameters.name.sep(&quot;, &quot;)%>) : &lt;%eType.name%>" sizeComputationExpression="2">
+            <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             </style>
           </conditionnalStyles>
         </subContainerMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="Container &lt;%name%>" backgroundStyle="GradientTopToBottom">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" labelExpression="aql:'Container ' + self.name" backgroundStyle="GradientTopToBottom">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -74,18 +75,18 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType3" titleExpression="DiagType3 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType3" titleExpression="aql:'DiagType3 of ' + self.name" domainClass="EPackage">
       <nodeMappings name="DT3_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-        <style xsi:type="style:SquareDescription" labelExpression="Node &lt;%name%>" resizeKind="NSEW">
+        <style xsi:type="style:SquareDescription" labelExpression="aql:'Node ' + self.name" resizeKind="NSEW">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </nodeMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType4" titleExpression="DiagType4 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType4" titleExpression="aql:'DiagType4 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT4_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -93,7 +94,7 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType5" titleExpression="DiagType5 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType5" titleExpression="aql:'DiagType5 of ' + self.name" domainClass="EPackage">
       <nodeMappings name="DT5_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
         <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="1" resizeKind="EAST_WEST">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -102,7 +103,7 @@
         </style>
       </nodeMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType6" titleExpression="DiagType6 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType6" titleExpression="aql:'DiagType6 of ' + self.name" domainClass="EPackage">
       <nodeMappings name="DT6_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
         <borderedNodeMappings name="DT6_ClassInRelation" semanticCandidatesExpression="&lt;%eReferences.eReferenceType%>" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
@@ -117,16 +118,16 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="DT6_EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-        <style sizeComputationExpression="1">
+      <edgeMappings name="DT6_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType7" titleExpression="DiagType7 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType7" titleExpression="aql:'DiagType7 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT7_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']">
         <borderedNodeMappings name="DT7_Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass">
           <style xsi:type="style:DotDescription" resizeKind="NSEW">
@@ -135,7 +136,7 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -143,7 +144,7 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType8" titleExpression="DiagType8 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType8" titleExpression="aql:'DiagType8 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT8_Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage">
         <borderedNodeMappings name="DT8_Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass">
           <style xsi:type="style:DotDescription" resizeKind="EAST_WEST">
@@ -152,7 +153,7 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -160,16 +161,16 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType9" titleExpression="DiagType9 of &lt;%name%>" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType9" titleExpression="aql:'DiagType9 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT9_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-        <borderedNodeMappings name="DT9_Class" semanticCandidatesExpression="&lt;%eAllContents()%>" domainClass="EClass">
+        <borderedNodeMappings name="DT9_Class" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EClass">
           <style xsi:type="style:DotDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container without children &lt;%name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/layouts.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/layouts.odesign
index 37395de269..d993dd10a2 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/layouts.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/layouts.odesign
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Layout" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Layout" version="10.0.0.201505222000">
   <ownedViewpoints name="ArrangeAll" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Top/Bottom Container Ports And Edges" domainClass="EPackage">
       <layout xsi:type="description_1:CompositeLayout"/>
       <defaultLayer name="Default">
         <edgeMappings name="EReference to EType" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Top%2FBottom%20Container%20Ports%20And%20Edges']/@defaultLayer/@containerMappings[name='EClass%20Container']/@borderedNodeMappings[name='EStructuralFeature%20Port']" targetMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Top%2FBottom%20Container%20Ports%20And%20Edges']/@defaultLayer/@containerMappings[name='EClass%20Container']/@borderedNodeMappings[name='EStructuralFeature%20Port']" targetFinderExpression="&lt;%eType.eStructuralFeatures%>">
-          <style>
+          <style sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EClass Container" semanticCandidatesExpression="&lt;%eClassifiers%>" domainClass="EClass">
-          <borderedNodeMappings name="EStructuralFeature Port" semanticCandidatesExpression="&lt;%eStructuralFeatures%>" domainClass="EStructuralFeature">
+        <containerMappings name="EClass Container" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass">
+          <borderedNodeMappings name="EStructuralFeature Port" semanticCandidatesExpression="aql:self.eStructuralFeatures" domainClass="EStructuralFeature">
             <style xsi:type="style:BundledImageDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -21,14 +21,14 @@
             </style>
           </borderedNodeMappings>
           <subContainerMappings name="EClass Child" semanticCandidatesExpression="&lt;%~eSuperTypes%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Top%2FBottom%20Container%20Ports%20And%20Edges']/@defaultLayer/@containerMappings[name='EClass%20Container']/@borderedNodeMappings[name='EStructuralFeature%20Port']" reusedContainerMappings="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Top%2FBottom%20Container%20Ports%20And%20Edges']/@defaultLayer/@containerMappings[name='EClass%20Container']/@subContainerMappings[name='EClass%20Child']">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             </style>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -41,7 +41,7 @@
       <layout xsi:type="description_1:CompositeLayout"/>
       <defaultLayer name="Default">
         <edgeMappings name="OrderEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Top%2FBottom%20MainLikeDiagram']/@defaultLayer/@containerMappings[name='Main%20Container']" targetMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Top%2FBottom%20MainLikeDiagram']/@defaultLayer/@containerMappings[name='Main%20Container']" targetFinderExpression="&lt;%preceding.filter(&quot;EClass&quot;).nLast%>">
-          <style>
+          <style sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -49,7 +49,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="Main Container" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -93,8 +93,8 @@
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TreeOrdering" domainClass="EPackage">
       <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="&lt;%~eSuperTypes.nSort%>" nodeMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='TreeOrdering']/@defaultLayer/@containerMappings[name='Tree%20EClass']"/>
       <defaultLayer name="Default">
-        <edgeMappings name="Tree SuperType Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='TreeOrdering']/@defaultLayer/@containerMappings[name='Tree%20EClass']" targetMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='TreeOrdering']/@defaultLayer/@containerMappings[name='Tree%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>">
-          <style routingStyle="tree">
+        <edgeMappings name="Tree SuperType Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='TreeOrdering']/@defaultLayer/@containerMappings[name='Tree%20EClass']" targetMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='TreeOrdering']/@defaultLayer/@containerMappings[name='Tree%20EClass']" targetFinderExpression="aql:self.eSuperTypes">
+          <style sizeComputationExpression="[eContents()->size()/]" routingStyle="tree">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -102,7 +102,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="Tree EClass" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -115,15 +115,15 @@
       <layout xsi:type="description_1:CompositeLayout" direction="bottomToTop"/>
       <defaultLayer name="Default">
         <edgeMappings name="EReference to EType" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Bottom%2FTop%20Container%20Ports%20And%20Edges']/@defaultLayer/@containerMappings[name='EClass%20Container']/@borderedNodeMappings[name='EStructuralFeature%20Port']" targetMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Bottom%2FTop%20Container%20Ports%20And%20Edges']/@defaultLayer/@containerMappings[name='EClass%20Container']/@borderedNodeMappings[name='EStructuralFeature%20Port']" targetFinderExpression="&lt;%eType.eStructuralFeatures%>">
-          <style>
+          <style sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EClass Container" semanticCandidatesExpression="&lt;%eClassifiers%>" domainClass="EClass">
-          <borderedNodeMappings name="EStructuralFeature Port" semanticCandidatesExpression="&lt;%eStructuralFeatures%>" domainClass="EStructuralFeature">
+        <containerMappings name="EClass Container" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass">
+          <borderedNodeMappings name="EStructuralFeature Port" semanticCandidatesExpression="aql:self.eStructuralFeatures" domainClass="EStructuralFeature">
             <style xsi:type="style:BundledImageDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -131,14 +131,14 @@
             </style>
           </borderedNodeMappings>
           <subContainerMappings name="EClass Child" semanticCandidatesExpression="&lt;%~eSuperTypes%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Bottom%2FTop%20Container%20Ports%20And%20Edges']/@defaultLayer/@containerMappings[name='EClass%20Container']/@borderedNodeMappings[name='EStructuralFeature%20Port']" reusedContainerMappings="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Bottom%2FTop%20Container%20Ports%20And%20Edges']/@defaultLayer/@containerMappings[name='EClass%20Container']/@subContainerMappings[name='EClass%20Child']">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             </style>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -150,7 +150,7 @@
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Bottom/Top MainLikeDiagram" domainClass="EPackage">
       <defaultLayer name="Default">
         <edgeMappings name="OrderEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Bottom%2FTop%20MainLikeDiagram']/@defaultLayer/@containerMappings[name='Main%20Container']" targetMapping="//@ownedViewpoints[name='ArrangeAll']/@ownedRepresentations[name='Bottom%2FTop%20MainLikeDiagram']/@defaultLayer/@containerMappings[name='Main%20Container']" targetFinderExpression="&lt;%preceding.filter(&quot;EClass&quot;).nLast%>">
-          <style>
+          <style sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -158,7 +158,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="Main Container" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/pinUnpinNote.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/pinUnpinNote.odesign
index 636dbe101e..e94fe5b536 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/pinUnpinNote.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/pinUnpinNote.odesign
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="pinUnpinNote" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="pinUnpinNote" version="10.0.0.201505222000">
   <ownedViewpoints name="pinnedNoteTest" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PinUnpinNoteDiag" domainClass="EPackage">
       <defaultLayer name="Default">
         <containerMappings name="Package2" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='pinnedNoteTest']/@ownedRepresentations[name='PinUnpinNoteDiag']/@defaultLayer/@toolSections.0/@ownedTools[name='DragClassToPackage']">
           <borderedNodeMappings name="Class2" semanticCandidatesExpression="feature:eContents" domainClass="EClass">
-            <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="&lt;%&quot;&quot;%>" sizeComputationExpression="1" resizeKind="NORTH_SOUTH">
+            <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="aql:''" sizeComputationExpression="1" resizeKind="NORTH_SOUTH">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
@@ -25,8 +25,8 @@
             <element name="element"/>
             <newViewContainer name="newContainerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="newSemanticContainer">
-                <subModelOperations xsi:type="tool:SetValue" featureName="eClassifiers" valueExpression="var:element"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="newSemanticContainer">
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="eClassifiers" valueExpression="var:element"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/tc1825.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/tc1825.odesign
index d8a3d2cfd2..5938c75cab 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/tc1825.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/tc1825.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ticket #1825 (partial layout)" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ticket #1825 (partial layout)" version="10.0.0.201505222000">
   <ownedViewpoints name="Tests Cases for ticket #1825 (partial layout)" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Nodes, Containers and Lists (flat)" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
@@ -11,7 +11,7 @@
           </style>
         </nodeMappings>
         <containerMappings name="CM_EClass" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <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']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
@@ -26,7 +26,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <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']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
@@ -50,15 +50,15 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Nodes and Containers (recursive)" domainClass="EPackage">
       <defaultLayer name="Default">
-        <nodeMappings name="NM_EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="NM_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:BundledImageDescription" labelPosition="node" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <containerMappings name="CM_EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231825%20(partial%20layout)']/@ownedRepresentations[name='Nodes%20and%20Containers%20(recursive)']/@defaultLayer/@nodeMappings[name='NM_EClass']" reusedContainerMappings="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231825%20(partial%20layout)']/@ownedRepresentations[name='Nodes%20and%20Containers%20(recursive)']/@defaultLayer/@containerMappings[name='CM_EPackage']">
-          <style xsi:type="style:FlatContainerStyleDescription">
+        <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231825%20(partial%20layout)']/@ownedRepresentations[name='Nodes%20and%20Containers%20(recursive)']/@defaultLayer/@nodeMappings[name='NM_EClass']" reusedContainerMappings="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231825%20(partial%20layout)']/@ownedRepresentations[name='Nodes%20and%20Containers%20(recursive)']/@defaultLayer/@containerMappings[name='CM_EPackage']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/tc1924.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/tc1924.odesign
index ed86bd4319..a36cdaa87e 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/tc1924.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/pinning/description/tc1924.odesign
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="tc1924" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="tc1924" version="10.0.0.201505222000">
   <ownedViewpoints name="Tests Cases for ticket #1924 (pin/unpin on tree diagram)" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="SimpleTreeDiagram" domainClass="EPackage">
-      <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="&lt;%~.filter(&quot;EClass&quot;)%>" nodeMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='SimpleTreeDiagram']/@nodeMappings[name='Class']"/>
+      <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="aql:self.eInverse(ecore::EClass)" nodeMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='SimpleTreeDiagram']/@nodeMappings[name='Class']"/>
       <nodeMappings name="Class" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
         <style xsi:type="style:SquareDescription" sizeComputationExpression="5" labelPosition="node">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -10,8 +10,8 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="SuperClass" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='SimpleTreeDiagram']/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='SimpleTreeDiagram']/@nodeMappings[name='Class']" targetFinderExpression="&lt;%eSuperTypes%>">
-        <style targetArrow="InputClosedArrow" routingStyle="tree">
+      <edgeMappings name="SuperClass" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='SimpleTreeDiagram']/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='SimpleTreeDiagram']/@nodeMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes">
+        <style targetArrow="InputClosedArrow" sizeComputationExpression="[eContents()->size()/]" routingStyle="tree">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </edgeMappings>
@@ -24,28 +24,28 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="SuperClass" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='SimpleDiagram']/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='SimpleDiagram']/@nodeMappings[name='Class']" targetFinderExpression="&lt;%eSuperTypes%>">
-        <style targetArrow="InputClosedArrow" routingStyle="tree">
+      <edgeMappings name="SuperClass" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='SimpleDiagram']/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='SimpleDiagram']/@nodeMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes">
+        <style targetArrow="InputClosedArrow" sizeComputationExpression="[eContents()->size()/]" routingStyle="tree">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </edgeMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="RecursiveTreeDiagram" domainClass="EPackage">
       <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="&lt;%if (filter(&quot;EClass&quot;).nSize() > 0){%>&lt;%~.filter(&quot;EClass&quot;)%>&lt;%}else if (filter(&quot;EPackage&quot;).nSize() > 0){%>&lt;%eSubpackages%>&lt;%}%>" nodeMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='RecursiveTreeDiagram']/@nodeMappings[name='Class'] //@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='RecursiveTreeDiagram']/@containerMappings[name='Package']"/>
-      <nodeMappings name="Class" semanticCandidatesExpression="&lt;%eClassifiers%>" domainClass="EClass">
+      <nodeMappings name="Class" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass">
         <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="6" labelPosition="node" resizeKind="NSEW">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="SuperClass" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='RecursiveTreeDiagram']/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='RecursiveTreeDiagram']/@nodeMappings[name='Class']" targetFinderExpression="&lt;%eSuperTypes%>">
-        <style targetArrow="InputClosedArrow" routingStyle="tree">
+      <edgeMappings name="SuperClass" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='RecursiveTreeDiagram']/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='RecursiveTreeDiagram']/@nodeMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes">
+        <style targetArrow="InputClosedArrow" sizeComputationExpression="[eContents()->size()/]" routingStyle="tree">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </edgeMappings>
-      <containerMappings name="Package" semanticCandidatesExpression="&lt;%eSubpackages%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='RecursiveTreeDiagram']/@nodeMappings[name='Class']" reusedContainerMappings="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='RecursiveTreeDiagram']/@containerMappings[name='Package']">
-        <style xsi:type="style:FlatContainerStyleDescription">
+      <containerMappings name="Package" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='RecursiveTreeDiagram']/@nodeMappings[name='Class']" reusedContainerMappings="//@ownedViewpoints[name='Tests%20Cases%20for%20ticket%20%231924%20(pin%2Funpin%20on%20tree%20diagram)']/@ownedRepresentations[name='RecursiveTreeDiagram']/@containerMappings[name='Package']">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/ticket1481/tc1481_domainbased.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/ticket1481/tc1481_domainbased.odesign
index adccc6e624..a5a046e8c8 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/ticket1481/tc1481_domainbased.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/ticket1481/tc1481_domainbased.odesign
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Ticket #1481" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Ticket #1481" version="10.0.0.201505222000">
   <ownedViewpoints name="Test case for ticket #1481 domain based" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1481 domain based" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="port collapse">
         <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']/@ownedRepresentations[name='TC1481%20domain%20based']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/>
       </filters>
       <defaultLayer name="Default">
-        <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']/@ownedRepresentations[name='TC1481%20domain%20based']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']/@ownedRepresentations[name='TC1481%20domain%20based']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="&lt;%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style routingStyle="manhattan">
+        <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']/@ownedRepresentations[name='TC1481%20domain%20based']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']/@ownedRepresentations[name='TC1481%20domain%20based']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style sizeComputationExpression="[eContents()->size()/]" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="CM_EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage">
-          <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage">
+          <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
             <style xsi:type="style:SquareDescription" width="2" height="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <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']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layoutingMode/vp2120.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layoutingMode/vp2120.odesign
index 013d21f6c6..ef27cf5ffa 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layoutingMode/vp2120.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layoutingMode/vp2120.odesign
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="LayoutingMode" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="LayoutingMode" version="10.0.0.201505222000">
   <ownedViewpoints name="LayoutingMode" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="LayoutingMode Diagram" domainClass="EPackage">
       <defaultLayer name="Default">
-        <nodeMappings name="NM_EEnum" label="NM_EEnum" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>" domainClass="EEnum">
+        <nodeMappings name="NM_EEnum" label="NM_EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum">
           <style xsi:type="style:EllipseNodeDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="&lt;%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style routingStyle="manhattan">
+        <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style sizeComputationExpression="[eContents()->size()/]" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="CM_EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" doubleClickDescription="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DoubleClick%20on%20Package']" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20brodered']">
-          <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" doubleClickDescription="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DoubleClick%20On%20Class']" domainClass="EClass">
+        <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" doubleClickDescription="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DoubleClick%20on%20Package']" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20brodered']">
+          <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" doubleClickDescription="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DoubleClick%20On%20Class']" domainClass="EClass">
             <style xsi:type="style:SquareDescription" width="2" height="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <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']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
@@ -51,7 +51,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="drop brodered" mappings="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="drop brodered" mappings="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/2182.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/2182.odesign
index 917a1bdb63..8721b8ec1b 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/2182.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/2182.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="doremi_2182" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="doremi_2182" version="10.0.0.201505222000">
   <ownedViewpoints name="doremi_2182" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi-2182_TC1" domainClass="EPackage" enablePopupBars="true">
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide EAnnotToRef">
@@ -9,22 +9,22 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='RefToEAnnot%20TC1']"/>
       </filters>
       <defaultLayer name="Default">
-        <nodeMappings name="EC EClass TC1" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EC EClass TC1" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EAnnot TC1" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EAnnotation&quot;)%>" domainClass="EAnnotation">
-          <style xsi:type="style:DotDescription" labelExpression="&lt;%source%>">
+        <nodeMappings name="EAnnot TC1" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EAnnotation)" domainClass="EAnnotation">
+          <style xsi:type="style:DotDescription" labelExpression="aql:self.source">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EAnnotToRef TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EAnnotToRef']" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='EAnnotToRefEdit']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMa%20TC4']" targetFinderExpression="&lt;%references%>" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='Reconnect%20EAnnotToRef']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EAnnotToRef TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EAnnotToRef']" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='EAnnotToRefEdit']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMa%20TC4']" targetFinderExpression="aql:self.references" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='Reconnect%20EAnnotToRef']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <centerLabelStyleDescription labelExpression="EAnnotToRef">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -32,17 +32,17 @@
           </style>
         </edgeMappings>
         <edgeMappings name="RefToEAnnot TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20RefToAnnot']" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='RefToEAnnotEdit']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetFinderExpression="&lt;%eAnnotations%>" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='Reconnect%20RefToEAnnot']">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             <centerLabelStyleDescription labelExpression="RefToEAnnot">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMa TC1" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMa TC1" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription labelExpression="EMa &lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:'EMa ' + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
@@ -53,7 +53,7 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -111,8 +111,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="references" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="references" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -121,10 +121,10 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eAnnotations" elementExpression="&lt;%$elementView.targetNode.target%>"/>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%getRootContainer()%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eAnnotations" valueExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eAnnotations" elementExpression="aql:elementView.targetNode.target"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eAnnotations" valueExpression="aql:elementView.targetNode.target"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -153,7 +153,7 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="eAnnotations" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="eAnnotations" valueExpression="aql:edgeView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
             <edgeView name="edgeView"/>
@@ -166,12 +166,12 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eReferences" valueExpression="var:element"/>
                   </subModelOperations>
@@ -199,29 +199,30 @@
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Imbricated EdgeMapping" activeByDefault="true">
-        <edgeMappings name="EMd TC1" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMc%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMd TC1" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMc%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_chocolate']"/>
-            <beginLabelStyleDescription labelExpression="&lt;%name%>">
+            <beginLabelStyleDescription labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </beginLabelStyleDescription>
-            <centerLabelStyleDescription labelExpression="EMd &lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:'EMd ' + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMc TC1" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMb%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMc TC1" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMb%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
-            <centerLabelStyleDescription labelExpression="EMc &lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:'EMc ' + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMb TC1" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMb TC1" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
-            <centerLabelStyleDescription labelSize="12" labelFormat="bold" labelExpression="EMb &lt;%name%>">
+            <centerLabelStyleDescription labelSize="12" labelExpression="aql:'EMb ' + self.name">
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
@@ -240,39 +241,39 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi-2182_TC2" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="EClass A" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EClass A" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <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']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EClass B" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EClass B" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EAnnotation" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EAnnotation&quot;)%>" domainClass="EAnnotation">
-          <style xsi:type="style:DotDescription" labelExpression="&lt;%source%>">
+        <nodeMappings name="EAnnotation" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EAnnotation)" domainClass="EAnnotation">
+          <style xsi:type="style:DotDescription" labelExpression="aql:self.source">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
         <edgeMappings name="EReference1" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="&lt;%eContents().filter(&quot;EReference&quot;).eType + eContents().filter(&quot;EReference&quot;)%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EReference1bis" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2']" targetFinderExpression="&lt;%eContents().filter(&quot;EReference&quot;)%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EReference1bis" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2']" targetFinderExpression="aql:self.eContents()->filter(ecore::EReference)" sourceFinderExpression="feature:eContainer" domainClass="EReference">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           </style>
         </edgeMappings>
         <edgeMappings name="EReference2" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="&lt;%eContents().filter(&quot;EReference&quot;).eType + eContents().filter(&quot;EReference&quot;)%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/>
           </style>
         </edgeMappings>
@@ -280,42 +281,42 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="doremi-2182_TC3" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="EC EClass TC3" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EC EClass TC3" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EAnnot TC3" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EAnnotation&quot;)%>" domainClass="EAnnotation">
-          <style xsi:type="style:DotDescription" labelExpression="&lt;%source%>">
+        <nodeMappings name="EAnnot TC3" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EAnnotation)" domainClass="EAnnotation">
+          <style xsi:type="style:DotDescription" labelExpression="aql:self.source">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EAnnotToRef TC3" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetFinderExpression="&lt;%references%>">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EAnnotToRef TC3" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetFinderExpression="aql:self.references">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EC_EReference TC3" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference TC3" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMa TC3" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMb%20TC3']" targetFinderExpression="&lt;%eType + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMa TC3" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMb%20TC3']" targetFinderExpression="&lt;%eType + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMb TC3" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMb TC3" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
           </style>
         </edgeMappings>
         <edgeMappings name="RefToEAnnot TC3" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetFinderExpression="&lt;%eAnnotations%>">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </edgeMappings>
@@ -326,12 +327,12 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -342,7 +343,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']">
+          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -371,7 +372,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -381,8 +382,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -407,12 +408,12 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eReferences" valueExpression="var:element"/>
                   </subModelOperations>
@@ -429,18 +430,18 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -459,9 +460,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -470,9 +471,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getReferenceNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="&lt;%getUpperBoundFromString($0)%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="&lt;%getLowerBoundFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -480,11 +481,11 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getOperationNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%createParameterFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -493,14 +494,14 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="doremi-2182_TC4" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="EC EClass TC4" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EC EClass TC4" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EMc TC4" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMb%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMc TC4" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMb%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
             <centerLabelStyleDescription labelExpression="EMc">
@@ -508,7 +509,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMb TC4" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMa%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMb TC4" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMa%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
             <centerLabelStyleDescription labelExpression="EMb">
@@ -516,7 +517,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMa TC4" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMa TC4" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelExpression="EMa">
@@ -531,12 +532,12 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -547,7 +548,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']">
+          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -576,7 +577,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -586,8 +587,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -612,12 +613,12 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eReferences" valueExpression="var:element"/>
                   </subModelOperations>
@@ -634,18 +635,18 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -664,9 +665,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -675,9 +676,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getReferenceNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="&lt;%getUpperBoundFromString($0)%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="&lt;%getLowerBoundFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -685,11 +686,11 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getOperationNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%createParameterFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -699,7 +700,7 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_diagram/2182-dnd.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_diagram/2182-dnd.odesign
index 973dc0cfe4..021935d43a 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_diagram/2182-dnd.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_diagram/2182-dnd.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="doremi_2182" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="doremi_2182" version="10.0.0.201505222000">
   <ownedViewpoints name="doremi_2182" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi-2182_TC1" domainClass="EPackage" enablePopupBars="true">
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide EAnnotToRef">
@@ -10,14 +10,14 @@
       </filters>
       <defaultLayer name="Default">
         <nodeMappings name="EAnnot TC1" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EAnnotation&quot;) + eAllContents.filter(&quot;EReference&quot;).eContents.filter(&quot;EAnnotation&quot;)%>" domainClass="EAnnotation">
-          <style xsi:type="style:DotDescription" labelExpression="&lt;%source%>">
+          <style xsi:type="style:DotDescription" labelExpression="aql:self.source">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EAnnotToRef TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EAnnotToRef']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetFinderExpression="&lt;%references%>" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='Reconnect%20EAnnotToRef']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EAnnotToRef TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EAnnotToRef']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetFinderExpression="aql:self.references" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='Reconnect%20EAnnotToRef']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <centerLabelStyleDescription labelExpression="EAnnotToRef">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -25,23 +25,23 @@
           </style>
         </edgeMappings>
         <edgeMappings name="RefToEAnnot TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20RefToAnnot']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" targetFinderExpression="&lt;%eAnnotations + eContainer.eReferences.eType.eAnnotations%>">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             <centerLabelStyleDescription labelExpression="RefToEAnnot">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMa TC1" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@containerMappings[name='EC%20EClass%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@containerMappings[name='EC%20EClass%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMa TC1" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@containerMappings[name='EC%20EClass%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@containerMappings[name='EC%20EClass%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription labelExpression="EMa &lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:'EMa ' + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EC EClass TC1" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='dndAnnotationInClass']" reusedNodeMappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']">
-          <style xsi:type="style:FlatContainerStyleDescription">
+        <containerMappings name="EC EClass TC1" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='dndAnnotationInClass']" reusedNodeMappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -103,8 +103,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="references" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="references" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -113,10 +113,10 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eAnnotations" elementExpression="&lt;%$elementView.targetNode.target%>"/>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%getRootContainer()%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eAnnotations" valueExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eAnnotations" elementExpression="aql:elementView.targetNode.target"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eAnnotations" valueExpression="aql:elementView.targetNode.target"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -144,12 +144,12 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eReferences" valueExpression="var:element"/>
                   </subModelOperations>
@@ -166,18 +166,18 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -186,7 +186,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Dnd">
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="dndAnnotationInClass" forceRefresh="true" mappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" dragSource="BOTH">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="dndAnnotationInClass" forceRefresh="true" mappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" dragSource="BOTH">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -200,26 +200,27 @@
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Imbricated EdgeMapping" activeByDefault="true">
-        <edgeMappings name="EMd TC1" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMc%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMd TC1" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMc%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_chocolate']"/>
-            <centerLabelStyleDescription labelExpression="EMd &lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:'EMd ' + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMc TC1" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMb%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMc TC1" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMb%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
-            <centerLabelStyleDescription labelExpression="EMc &lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:'EMc ' + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMb TC1" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@toolSections.0/@ownedTools[name='EMb']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMb TC1" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@toolSections.0/@ownedTools[name='EMb']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
-            <centerLabelStyleDescription labelSize="12" labelFormat="bold" labelExpression="EMb &lt;%name%>">
+            <centerLabelStyleDescription labelSize="12" labelExpression="aql:'EMb ' + self.name">
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
@@ -238,39 +239,39 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi-2182_TC2" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="EClass A" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EClass A" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <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']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EClass B" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EClass B" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EAnnotation" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EAnnotation&quot;)%>" domainClass="EAnnotation">
-          <style xsi:type="style:DotDescription" labelExpression="&lt;%source%>">
+        <nodeMappings name="EAnnotation" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EAnnotation)" domainClass="EAnnotation">
+          <style xsi:type="style:DotDescription" labelExpression="aql:self.source">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
         <edgeMappings name="EReference1" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="&lt;%eContents().filter(&quot;EReference&quot;).eType + eContents().filter(&quot;EReference&quot;)%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EReference1bis" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2']" targetFinderExpression="&lt;%eContents().filter(&quot;EReference&quot;)%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EReference1bis" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2']" targetFinderExpression="aql:self.eContents()->filter(ecore::EReference)" sourceFinderExpression="feature:eContainer" domainClass="EReference">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           </style>
         </edgeMappings>
         <edgeMappings name="EReference2" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="&lt;%eContents().filter(&quot;EReference&quot;).eType + eContents().filter(&quot;EReference&quot;)%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/>
           </style>
         </edgeMappings>
@@ -278,42 +279,42 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="doremi-2182_TC3" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="EC EClass TC3" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EC EClass TC3" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EAnnot TC3" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EAnnotation&quot;)%>" domainClass="EAnnotation">
-          <style xsi:type="style:DotDescription" labelExpression="&lt;%source%>">
+        <nodeMappings name="EAnnot TC3" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EAnnotation)" domainClass="EAnnotation">
+          <style xsi:type="style:DotDescription" labelExpression="aql:self.source">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EAnnotToRef TC3" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetFinderExpression="&lt;%references%>">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EAnnotToRef TC3" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetFinderExpression="aql:self.references">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EC_EReference TC3" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference TC3" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMa TC3" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMb%20TC3']" targetFinderExpression="&lt;%eType + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMa TC3" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMb%20TC3']" targetFinderExpression="&lt;%eType + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMb TC3" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMb TC3" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
           </style>
         </edgeMappings>
         <edgeMappings name="RefToEAnnot TC3" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetFinderExpression="&lt;%eAnnotations%>">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </edgeMappings>
@@ -324,12 +325,12 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -340,7 +341,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']">
+          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -369,7 +370,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -379,8 +380,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -405,12 +406,12 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eReferences" valueExpression="var:element"/>
                   </subModelOperations>
@@ -427,18 +428,18 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -457,9 +458,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -468,9 +469,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getReferenceNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="&lt;%getUpperBoundFromString($0)%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="&lt;%getLowerBoundFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -478,11 +479,11 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getOperationNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%createParameterFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -491,14 +492,14 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="doremi-2182_TC4" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="EC EClass TC4" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EC EClass TC4" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EMc TC4" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMb%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMc TC4" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMb%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
             <centerLabelStyleDescription labelExpression="EMc">
@@ -506,7 +507,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMb TC4" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMa%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMb TC4" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMa%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
             <centerLabelStyleDescription labelExpression="EMb">
@@ -514,7 +515,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMa TC4" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMa TC4" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelExpression="EMa">
@@ -529,12 +530,12 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -545,7 +546,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']">
+          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -574,7 +575,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -584,8 +585,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -610,12 +611,12 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eReferences" valueExpression="var:element"/>
                   </subModelOperations>
@@ -632,18 +633,18 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -662,9 +663,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -673,9 +674,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getReferenceNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="&lt;%getUpperBoundFromString($0)%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="&lt;%getLowerBoundFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -683,11 +684,11 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getOperationNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%createParameterFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -697,7 +698,7 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_model_content/2182-dnd.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_model_content/2182-dnd.odesign
index c5fdbaaba4..a0c94f6865 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_model_content/2182-dnd.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_model_content/2182-dnd.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="doremi_2182" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="doremi_2182" version="10.0.0.201505222000">
   <ownedViewpoints name="doremi_2182" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='dndClassInPackage']" name="doremi-2182_TC1" domainClass="EPackage" enablePopupBars="true">
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide EAnnotToRef">
@@ -10,14 +10,14 @@
       </filters>
       <defaultLayer name="Default">
         <nodeMappings name="EAnnot TC1" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EAnnotation&quot;) + eAllContents.filter(&quot;EReference&quot;).eContents.filter(&quot;EAnnotation&quot;)%>" domainClass="EAnnotation">
-          <style xsi:type="style:DotDescription" labelExpression="&lt;%source%>">
+          <style xsi:type="style:DotDescription" labelExpression="aql:self.source">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EAnnotToRef TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EAnnotToRef']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetFinderExpression="&lt;%references%>" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='Reconnect%20EAnnotToRef']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EAnnotToRef TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EAnnotToRef']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetFinderExpression="aql:self.references" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='Reconnect%20EAnnotToRef']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <centerLabelStyleDescription labelExpression="EAnnotToRef">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -25,23 +25,23 @@
           </style>
         </edgeMappings>
         <edgeMappings name="RefToEAnnot TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20RefToAnnot']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" targetFinderExpression="&lt;%eAnnotations + eContainer.eReferences.eType.eAnnotations%>">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             <centerLabelStyleDescription labelExpression="RefToEAnnot">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMa TC1" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@containerMappings[name='EC%20EClass%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@containerMappings[name='EC%20EClass%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMa TC1" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@containerMappings[name='EC%20EClass%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@containerMappings[name='EC%20EClass%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription labelExpression="EMa &lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:'EMa ' + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EC EClass TC1" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='dndClassInPackage']" reusedNodeMappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']">
-          <style xsi:type="style:FlatContainerStyleDescription">
+        <containerMappings name="EC EClass TC1" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='dndClassInPackage']" reusedNodeMappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -103,8 +103,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="references" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="references" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -113,10 +113,10 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eAnnotations" elementExpression="&lt;%$elementView.targetNode.target%>"/>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%getRootContainer()%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eAnnotations" valueExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eAnnotations" elementExpression="aql:elementView.targetNode.target"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eAnnotations" valueExpression="aql:elementView.targetNode.target"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -144,12 +144,12 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eReferences" valueExpression="var:element"/>
                   </subModelOperations>
@@ -166,18 +166,18 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -186,7 +186,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Dnd">
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="dndClassInPackage" forceRefresh="true" mappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@containerMappings[name='EC%20EClass%20TC1'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" dragSource="BOTH">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="dndClassInPackage" forceRefresh="true" mappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@containerMappings[name='EC%20EClass%20TC1'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" dragSource="BOTH">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -205,26 +205,27 @@
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Imbricated EdgeMapping" activeByDefault="true">
-        <edgeMappings name="EMd TC1" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMc%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMd TC1" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMc%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_chocolate']"/>
-            <centerLabelStyleDescription labelExpression="EMd &lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:'EMd ' + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMc TC1" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMb%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMc TC1" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@edgeMappings[name='EMb%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
-            <centerLabelStyleDescription labelExpression="EMc &lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:'EMc ' + self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMb TC1" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@toolSections.0/@ownedTools[name='EMb']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMb TC1" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@additionalLayers[name='Imbricated%20EdgeMapping']/@toolSections.0/@ownedTools[name='EMb']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
-            <centerLabelStyleDescription labelSize="12" labelFormat="bold" labelExpression="EMb &lt;%name%>">
+            <centerLabelStyleDescription labelSize="12" labelExpression="aql:'EMb ' + self.name">
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
@@ -243,39 +244,39 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi-2182_TC2" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="EClass A" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EClass A" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <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']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EClass B" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EClass B" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EAnnotation" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EAnnotation&quot;)%>" domainClass="EAnnotation">
-          <style xsi:type="style:DotDescription" labelExpression="&lt;%source%>">
+        <nodeMappings name="EAnnotation" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EAnnotation)" domainClass="EAnnotation">
+          <style xsi:type="style:DotDescription" labelExpression="aql:self.source">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
         <edgeMappings name="EReference1" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="&lt;%eContents().filter(&quot;EReference&quot;).eType + eContents().filter(&quot;EReference&quot;)%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EReference1bis" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2']" targetFinderExpression="&lt;%eContents().filter(&quot;EReference&quot;)%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EReference1bis" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2']" targetFinderExpression="aql:self.eContents()->filter(ecore::EReference)" sourceFinderExpression="feature:eContainer" domainClass="EReference">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           </style>
         </edgeMappings>
         <edgeMappings name="EReference2" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="&lt;%eContents().filter(&quot;EReference&quot;).eType + eContents().filter(&quot;EReference&quot;)%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/>
           </style>
         </edgeMappings>
@@ -283,42 +284,42 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="doremi-2182_TC3" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="EC EClass TC3" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EC EClass TC3" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EAnnot TC3" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EAnnotation&quot;)%>" domainClass="EAnnotation">
-          <style xsi:type="style:DotDescription" labelExpression="&lt;%source%>">
+        <nodeMappings name="EAnnot TC3" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EAnnotation)" domainClass="EAnnotation">
+          <style xsi:type="style:DotDescription" labelExpression="aql:self.source">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EAnnotToRef TC3" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetFinderExpression="&lt;%references%>">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EAnnotToRef TC3" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetFinderExpression="aql:self.references">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EC_EReference TC3" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference TC3" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMa TC3" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMb%20TC3']" targetFinderExpression="&lt;%eType + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMa TC3" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMb%20TC3']" targetFinderExpression="&lt;%eType + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMb TC3" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMb TC3" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC3']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
           </style>
         </edgeMappings>
         <edgeMappings name="RefToEAnnot TC3" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@edgeMappings[name='EMa%20TC3']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']/@defaultLayer/@nodeMappings[name='EAnnot%20TC3']" targetFinderExpression="&lt;%eAnnotations%>">
-          <style sizeComputationExpression="1">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </edgeMappings>
@@ -329,12 +330,12 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -345,7 +346,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']">
+          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC3']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -374,7 +375,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -384,8 +385,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -410,12 +411,12 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eReferences" valueExpression="var:element"/>
                   </subModelOperations>
@@ -432,18 +433,18 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -462,9 +463,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -473,9 +474,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getReferenceNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="&lt;%getUpperBoundFromString($0)%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="&lt;%getLowerBoundFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -483,11 +484,11 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getOperationNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%createParameterFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -496,14 +497,14 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="doremi-2182_TC4" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="EC EClass TC4" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <nodeMappings name="EC EClass TC4" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
           <style xsi:type="style:SquareDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="EMc TC4" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMb%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="EMc TC4" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMb%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer() + eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
             <centerLabelStyleDescription labelExpression="EMc">
@@ -511,7 +512,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMb TC4" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMa%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMb TC4" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@edgeMappings[name='EMa%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;% eContainer().eContents().filter(&quot;EAnnotation&quot;).references%>" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
             <centerLabelStyleDescription labelExpression="EMb">
@@ -519,7 +520,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="EMa TC4" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
+        <edgeMappings name="EMa TC4" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.3/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@nodeMappings[name='EC%20EClass%20TC4']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']/@defaultLayer/@toolSections.2/@ownedTools[name='ReconnectEReference']">
           <style sizeComputationExpression="3">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelExpression="EMa">
@@ -534,12 +535,12 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -550,7 +551,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']">
+          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC4']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -579,7 +580,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -589,8 +590,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -615,12 +616,12 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eReferences" valueExpression="var:element"/>
                   </subModelOperations>
@@ -637,18 +638,18 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                    <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -667,9 +668,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -678,9 +679,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getReferenceNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="&lt;%getUpperBoundFromString($0)%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="&lt;%getLowerBoundFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -688,11 +689,11 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getOperationNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%createParameterFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -702,7 +703,7 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/trac1926.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/trac1926.odesign
index 47d9e5b5c4..33c3a2bff2 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/trac1926.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/trac1926.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="10.0.0.201505222000">
   <ownedViewpoints name="trac1926" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D1" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="F1">
@@ -20,12 +20,12 @@
           </style>
         </nodeMappings>
         <edgeMappings name="M2" sourceMapping="//@ownedViewpoints[name='trac1926']/@ownedRepresentations[name='D1']/@defaultLayer/@nodeMappings[name='M1']" targetMapping="//@ownedViewpoints[name='trac1926']/@ownedRepresentations[name='D1']/@defaultLayer/@nodeMappings[name='M1']" targetFinderExpression="&lt;%eStructuralFeatures.eType.nMinimize%>">
-          <style>
+          <style sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </edgeMappings>
         <containerMappings name="M3" semanticCandidatesExpression="&lt;%eAllContents(&quot;EClass&quot;)[name.startsWith(&quot;c&quot;)]%>" domainClass="EClass">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -42,14 +42,14 @@
           </style>
         </nodeMappings>
         <edgeMappingImports name="MI2" importedMapping="//@ownedViewpoints[name='trac1926']/@ownedRepresentations[name='D1']/@defaultLayer/@edgeMappings[name='M2']">
-          <conditionnalStyles predicateExpression="&lt;%true%>">
-            <style>
+          <conditionnalStyles predicateExpression="aql:true">
+            <style sizeComputationExpression="[eContents()->size()/]">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
         </edgeMappingImports>
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="MI3" semanticCandidatesExpression="&lt;%eAllContents(&quot;EClass&quot;)[name.startsWith(&quot;c&quot;)]%>" importedMapping="//@ownedViewpoints[name='trac1926']/@ownedRepresentations[name='D1']/@defaultLayer/@containerMappings[name='M3']">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
@@ -68,14 +68,14 @@
           </style>
         </nodeMappings>
         <edgeMappingImports name="MIE2" importedMapping="//@ownedViewpoints[name='trac1926']/@ownedRepresentations[name='D1']/@defaultLayer/@edgeMappings[name='M2']">
-          <conditionnalStyles predicateExpression="&lt;%true%>">
-            <style>
+          <conditionnalStyles predicateExpression="aql:true">
+            <style sizeComputationExpression="[eContents()->size()/]">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
             </style>
           </conditionnalStyles>
         </edgeMappingImports>
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="MIE3" semanticCandidatesExpression="&lt;%eAllContents(&quot;EClass&quot;)[name.startsWith(&quot;c&quot;)]%>" importedMapping="//@ownedViewpoints[name='trac1926']/@ownedRepresentations[name='D1']/@defaultLayer/@containerMappings[name='M3']">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/ecore_with_blank.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/ecore_with_blank.odesign
index 2bf0f37757..b8f3f74fa3 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/ecore_with_blank.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/ecore_with_blank.odesign
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6 (with blank)" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6 (with blank)" version="10.0.0.201505222000">
   <ownedViewpoints endUserDocumentation="Provides graphical and tabular modelers to design an Ecore model." name="Design" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20external%20package']" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities" titleExpression="&lt;%name%> package entities" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20external%20package']" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true">
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
       </filters>
@@ -12,68 +12,70 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features">
-        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="&lt;%filter(&quot;EStructuralFeature&quot;).derived == false%>"/>
+        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/>
       </filters>
       <validationSet>
-        <ownedRules xsi:type="validation:ViewValidationRule" message="The &lt;%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+        <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
           <audits auditExpression="&lt;%(((target + target.eAllSuperTypes).~.filter(&quot;EClass&quot;) + (target + target.eAllSuperTypes).~.filter(&quot;EReference&quot;) ) - target.eAllStructuralFeatures).nSize != 0%>"/>
           <fixes name="Remove Element">
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%target%>">
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target">
                 <subModelOperations xsi:type="tool:RemoveElement"/>
               </firstModelOperations>
             </initialOperation>
           </fixes>
         </ownedRules>
         <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The &lt;%target.name%> class has more than 3 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <audits auditExpression="&lt;%target.eAllSuperTypes.nSize &lt; 4%>"/>
+          <audits auditExpression="aql:self.target.eAllSuperTypes->size() &lt; 4"/>
         </ownedRules>
       </validationSet>
       <defaultLayer name="Default">
-        <edgeMappings name="EC_EReference" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%render%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
           <conditionnalStyles predicateExpression="&lt;%containment &amp;&amp; derived%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-              <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="&lt;%render%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()">
+                <labelFormat>italic</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="&lt;%!containment &amp;&amp; derived%>">
-            <style sizeComputationExpression="1">
+            <style>
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-              <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="&lt;%render%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()">
+                <labelFormat>italic</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%render%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']">
-          <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree">
+        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']">
+          <style targetArrow="InputClosedArrow" routingStyle="tree">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
           <conditionnalStyles predicateExpression="&lt;%$view.targetNode.filter(&quot;EClass&quot;)[interface]%>">
-            <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree">
+            <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <centerLabelStyleDescription showIcon="false">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -81,45 +83,46 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="&lt;%getEOppositeEReferences(eAllContents(&quot;EReference&quot;))%>" semanticElements="&lt;%self + eOpposite%>" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true">
-          <style targetArrow="NoDecoration" sizeComputationExpression="1">
+        <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="&lt;%getEOppositeEReferences(eAllContents(&quot;EReference&quot;))%>" semanticElements="&lt;%self + eOpposite%>" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true">
+          <style targetArrow="NoDecoration">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEOppositeEReferenceName()%>">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List">
+        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%render%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.render()" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + eParameters%>" domainClass="EOperation">
-            <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="&lt;%render%>" labelAlignment="LEFT" tooltipExpression="&lt;%name%>(&lt;%eParameters.name.sep(&quot;, &quot;)%>) : &lt;%eType.name%>" sizeComputationExpression="2">
+          <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation">
+            <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>" domainClass="EEnum" childrenPresentation="List">
+        <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List">
           <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral">
             <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -127,7 +130,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -135,15 +138,15 @@
           </style>
         </containerMappings>
         <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EDataType&quot;)[eClass.name == &quot;EDataType&quot;]%>" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EC External EClass" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EClass&quot;) - eContents.filter(&quot;EClass&quot;)%>" createElements="false" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%name%> in &lt;%eResourceName%>" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="&lt;%name%> in &lt;%eResourceName%>" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -157,7 +160,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -166,7 +169,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="abstract" valueExpression="true"/>
                 </firstModelOperations>
               </initialOperation>
@@ -196,7 +199,7 @@
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EEnum" referenceName="eClassifiers"/>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -232,7 +235,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -243,7 +246,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -256,7 +259,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']">
+          <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -295,12 +298,12 @@
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:source"/>
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%$source.name.toLowerCase()%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:source.name.toLower()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceSource">
                     <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%$target.name.toLowerCase()%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/>
                     <subModelOperations xsi:type="tool:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:instanceTarget">
@@ -320,7 +323,7 @@
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -330,8 +333,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -345,28 +348,28 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
-                  <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd == $sourceView%>">
-                    <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd == $edgeView.targetNode%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()">
+                  <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = sourceView">
+                    <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = edgeView.targetNode">
                       <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                         <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/>
                       </subModelOperations>
                     </subModelOperations>
-                    <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd != $edgeView.targetNode%>">
+                    <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd &lt;> edgeView.targetNode">
                       <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
-                        <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                        <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:edgeView.targetNode.target"/>
                       </subModelOperations>
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$otherEnd.getTarget()%>">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:otherEnd.getTarget()">
                         <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd != $sourceView%>">
+                  <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd &lt;> sourceView">
                     <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                       <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/>
                     </subModelOperations>
@@ -384,35 +387,35 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source==$element%>">
-                  <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd == $sourceView%>">
-                    <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd == $edgeView.targetNode%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element">
+                  <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = sourceView">
+                    <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = edgeView.targetNode">
                       <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
-                        <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                        <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                         <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
                           <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:element"/>
                         </subModelOperations>
                       </subModelOperations>
                     </subModelOperations>
-                    <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd != $edgeView.targetNode%>">
+                    <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd &lt;> edgeView.targetNode">
                       <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
                         <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                         <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd != $sourceView%>">
+                  <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd &lt;> sourceView">
                     <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
-                      <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                      <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
-                      <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                      <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
@@ -431,26 +434,26 @@
           <ownedTools xsi:type="tool_1:DirectEditLabel" name="Edit EAttribute Name">
             <mask mask="{0}"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%self.performEdit($0)%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/>
             </initialOperation>
           </ownedTools>
           <ownedTools xsi:type="tool_1:DirectEditLabel" name="EReference Name">
             <mask mask="{0}"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%self.performEdit($0)%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/>
             </initialOperation>
           </ownedTools>
           <ownedTools xsi:type="tool_1:DirectEditLabel" documentation="- &quot;name&quot; : change the name of the operation" name="Operation Name" forceRefresh="true">
             <mask mask="{0}"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%self.performEdit($0)%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/>
             </initialOperation>
           </ownedTools>
         </toolSections>
       </defaultLayer>
       <additionalLayers endUserDocumentation="Add support for sub-packages." name="Package" activeByDefault="true">
-        <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -458,7 +461,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -472,12 +475,12 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package &lt;%eContainer().eContents.filter(&quot;EPackage&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -488,7 +491,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop external package" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop external package" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -501,7 +504,7 @@
       </additionalLayers>
       <additionalLayers name="Dynamic">
         <toolSections name="Dynamic">
-          <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="&lt;%filter(&quot;EClass&quot;)%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
+          <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -513,20 +516,21 @@
         </toolSections>
       </additionalLayers>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes" titleExpression="Classes in &lt;%name%> package" domainClass="EPackage">
-      <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
-        <foregroundConditionalStyle predicateExpression="&lt;%abstract%>">
-          <style labelSize="10" labelFormat="italic">
+    <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes" titleExpression="aql:'Classes in ' + self.name + ' package'" domainClass="EPackage">
+      <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
+        <foregroundConditionalStyle predicateExpression="aql:self.abstract">
+          <style labelSize="10">
+            <labelFormat>italic</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </foregroundConditionalStyle>
         <ownedSubLines name="Feature" domainClass="EStructuralFeature"/>
       </ownedLineMappings>
-      <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="&lt;%name%>">
+      <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="aql:self.name">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
         </defaultBackground>
-        <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
+        <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
           <ownedSubLines name="Feature" domainClass="EStructuralFeature"/>
         </ownedSubLines>
       </ownedLineMappings>
@@ -553,45 +557,45 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20Bi-directional%20EC_EReference%20']"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features">
-        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="&lt;%filter(&quot;EStructuralFeature&quot;).derived == false%>"/>
+        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/>
       </filters>
       <validationSet>
-        <ownedRules xsi:type="validation:ViewValidationRule" message="The &lt;%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
+        <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
           <audits auditExpression="&lt;%(((target + target.eAllSuperTypes).~.filter(&quot;EClass&quot;) + (target + target.eAllSuperTypes).~.filter(&quot;EReference&quot;) ) - target.eAllStructuralFeatures).nSize != 0%>"/>
         </ownedRules>
         <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The &lt;%target.name%> class has more than 3 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
-          <audits auditExpression="&lt;%target.eAllSuperTypes.nSize &lt; 4%>"/>
+          <audits auditExpression="aql:self.target.eAllSuperTypes->size() &lt; 4"/>
         </ownedRules>
       </validationSet>
       <defaultLayer name="Default">
-        <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;).eStructuralFeatures.filter(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectBlankEReference']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;).eStructuralFeatures.filter(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectBlankEReference']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription labelExpression="&lt;%render%>">
+            <centerLabelStyleDescription labelExpression="aql:self.render()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription labelExpression="&lt;%render%>">
+              <centerLabelStyleDescription labelExpression="aql:self.render()">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="&lt;%getEOppositeEReferences(eClassifiers.filter(&quot;EClass&quot;).eStructuralFeatures.filter(&quot;EReference&quot;))%>" semanticElements="&lt;%self + eOpposite%>" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true">
-          <style targetArrow="NoDecoration" sizeComputationExpression="1">
+        <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="&lt;%getEOppositeEReferences(eClassifiers.filter(&quot;EClass&quot;).eStructuralFeatures.filter(&quot;EReference&quot;))%>" semanticElements="&lt;%self + eOpposite%>" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true">
+          <style targetArrow="NoDecoration">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEOppositeEReferenceName()%>">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEBlankSupertype']">
+        <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEBlankSupertype']">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -601,7 +605,7 @@
         </edgeMappings>
         <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EClass&quot;)%>" createElements="false" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%render%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.render()" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -614,15 +618,16 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -637,7 +642,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -645,7 +650,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EDataType&quot;)%>" createElements="false" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -658,7 +663,7 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -701,12 +706,12 @@
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:source"/>
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%$source.name.toLowerCase()%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:source.name.toLower()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceSource">
                     <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%$target.name.toLowerCase()%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/>
                     <subModelOperations xsi:type="tool:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:instanceTarget">
@@ -726,7 +731,7 @@
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -774,7 +779,7 @@
           <ownedTools xsi:type="tool_1:DirectEditLabel" name="Edit EAttribute Name">
             <mask mask="{0}"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%self.performEdit($0)%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/>
             </initialOperation>
           </ownedTools>
           <ownedTools xsi:type="tool_1:DeleteElementDescription" name="Delete ESuperType">
@@ -782,12 +787,12 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -804,28 +809,28 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
-                  <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd == $sourceView%>">
-                    <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd == $edgeView.targetNode%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()">
+                  <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = sourceView">
+                    <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = edgeView.targetNode">
                       <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                         <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/>
                       </subModelOperations>
                     </subModelOperations>
-                    <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd != $edgeView.targetNode%>">
+                    <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd &lt;> edgeView.targetNode">
                       <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
-                        <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                        <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:edgeView.targetNode.target"/>
                       </subModelOperations>
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$otherEnd.getTarget()%>">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:otherEnd.getTarget()">
                         <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd != $sourceView%>">
+                  <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd &lt;> sourceView">
                     <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                       <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/>
                     </subModelOperations>
@@ -843,35 +848,35 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source==$element%>">
-                  <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd == $sourceView%>">
-                    <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd == $edgeView.targetNode%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element">
+                  <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = sourceView">
+                    <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = edgeView.targetNode">
                       <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
-                        <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                        <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                         <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
                           <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:element"/>
                         </subModelOperations>
                       </subModelOperations>
                     </subModelOperations>
-                    <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd != $edgeView.targetNode%>">
+                    <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd &lt;> edgeView.targetNode">
                       <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element">
                         <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                         <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$otherEnd != $sourceView%>">
+                  <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd &lt;> sourceView">
                     <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
-                      <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                      <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
-                      <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                      <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
@@ -882,8 +887,8 @@
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Blank Layer Package" activeByDefault="true">
-        <containerMappings name="Blank Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="Blank Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -891,7 +896,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Blank Dropped Package" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -905,7 +910,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package &lt;%eContainer().eContents.filter(&quot;EPackage&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -915,7 +920,7 @@
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="Package from treeview and diagram" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']" dragSource="BOTH">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Package from treeview and diagram" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']" dragSource="BOTH">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -931,37 +936,37 @@
   <ownedViewpoints endUserDocumentation="Add support for archeypes-based modeling to the Entities modeler." name="Archetype" modelFileExtension="ecore">
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities With Archetypes" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities">
       <layers name="Archetypes" activeByDefault="true">
-        <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <conditionnalStyles predicateExpression="&lt;%isMomentInterval%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']">
+        <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+          <conditionnalStyles predicateExpression="aql:self.isMomentInterval()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isDescription%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']">
+          <conditionnalStyles predicateExpression="aql:self.isDescription()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isThing%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']">
+          <conditionnalStyles predicateExpression="aql:self.isThing()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isRole%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']">
+          <conditionnalStyles predicateExpression="aql:self.isRole()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isInterface%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.isInterface()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -975,15 +980,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new MomentInterval &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;MomentInterval&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new MomentInterval ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;MomentInterval&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;MomentInterval&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;MomentInterval&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -993,15 +998,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Description &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Description&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Description ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Description&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Description&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Description&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1011,15 +1016,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Role &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Role&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Role ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Role&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Role&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Role&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1029,15 +1034,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Thing &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Thing&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Thing ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Thing&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Thing&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Thing&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1059,7 +1064,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%self + eAllContents(&quot;EPackage&quot;)%>" domainClass="EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="&lt;%name%> : &lt;%nsURI%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -1069,22 +1074,22 @@
       </defaultLayer>
       <additionalLayers name="Content">
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']">
-          <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+          <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
             <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-              <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+              <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
-            <conditionnalStyles predicateExpression="&lt;%abstract%>">
-              <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <conditionnalStyles predicateExpression="aql:self.abstract">
+              <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -1099,19 +1104,21 @@
       <defaultLayer name="Default">
         <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom">
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom">
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -1120,15 +1127,15 @@
         </containerMappings>
       </defaultLayer>
       <additionalLayers name="Used by">
-        <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="&lt;%~.filter(&quot;EReference&quot;)%>" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <centerLabelStyleDescription>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -1136,7 +1143,7 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Related Used by  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="&lt;%~.filter(&quot;EClass&quot;)%>">
+        <edgeMappings name="Related Used by  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -1145,14 +1152,14 @@
           </style>
         </edgeMappings>
         <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%(~.filter(&quot;EClass&quot;) + ~.filter(&quot;EReference&quot;).eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -1162,15 +1169,15 @@
         </containerMappings>
       </additionalLayers>
       <additionalLayers name="Uses">
-        <edgeMappings name="Related Use  EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eAllStructuralFeatures.filter(&quot;EReference&quot;).eType%>" sourceFinderExpression="" domainClass="EReference">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Related Use  EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eAllStructuralFeatures.filter(&quot;EReference&quot;).eType%>" sourceFinderExpression="" domainClass="EReference">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <centerLabelStyleDescription>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -1178,7 +1185,7 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Related Use  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Related Use  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -1187,14 +1194,14 @@
           </style>
         </edgeMappings>
         <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%(self.eAllStructuralFeatures.filter(&quot;EReference&quot;).eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -1206,7 +1213,7 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" domainClass="EClass">
       <defaultLayer name="Default">
-        <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -1214,7 +1221,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -1224,36 +1231,38 @@
         </edgeMappings>
         <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="H SuperTypes" semanticCandidatesExpression="&lt;%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -1266,8 +1275,9 @@
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities">
       <layers name="Size">
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
+            <labelFormat>italic</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
@@ -1277,14 +1287,15 @@
   </ownedViewpoints>
   <ownedViewpoints endUserDocumentation="Provides representation to document and review Ecore models." name="Review" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Tags" titleExpression="Tags for &lt;%name%> package" domainClass="EPackage" initialHeaderColumnWidth="30">
-      <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
-        <defaultForeground labelSize="8" labelFormat="bold">
+      <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
+        <defaultForeground labelSize="8">
+          <labelFormat>bold</labelFormat>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </defaultForeground>
-        <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>"/>
+        <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"/>
       </ownedLineMappings>
       <ownedColumnMappings name="Available Tags" headerLabelExpression="&lt;%if (filter(&quot;EStructuralFeature&quot;) &amp;&amp; derived) {%>/&lt;%}%>&lt;%key%>" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="&lt;%getRootContainer.eAnnotations[source==&quot;Tags&quot;].details%>"/>
-      <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="&lt;%references%>" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;TagValues&quot;]%>" domainClass="EAnnotation">
+      <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="aql:self.references" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;TagValues&quot;]%>" domainClass="EAnnotation">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -1318,7 +1329,7 @@
         <variables name="root" documentation="The semantic element of the table."/>
         <variables name="element" documentation="The semantic currently edited element."/>
         <variables name="container" documentation="The semantic element corresponding to the view container."/>
-        <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%getRootContainer()%>">
+        <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()">
           <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%eAnnotations[source==&quot;Tags&quot;].nSize == 0%>">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation">
               <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="Tags"/>
@@ -1333,18 +1344,18 @@
       </createColumn>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:CrossTableDescription" endUserDocumentation="Document the concepts in a package." name="Documentation" titleExpression="Documentation for &lt;%name%> package" domainClass="EPackage">
-      <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="feature:eContents" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
+      <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="feature:eContents" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
         </defaultBackground>
-        <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
+        <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
           <defaultBackground>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </defaultBackground>
         </ownedSubLines>
       </ownedLineMappings>
-      <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="&lt;%getRootContainer%>"/>
-      <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="&lt;%value%>" useDomainClass="true" columnFinderExpression="&lt;%getRootContainer()%>" lineFinderExpression="&lt;%eContainer(&quot;EAnnotation&quot;).eContainer()%>" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;http://www.eclipse.org/emf/2002/GenModel&quot;].details[key==&quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
+      <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/>
+      <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="&lt;%eContainer(&quot;EAnnotation&quot;).eContainer()%>" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;http://www.eclipse.org/emf/2002/GenModel&quot;].details[key==&quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -1384,9 +1395,9 @@
   </ownedViewpoints>
   <ownedViewpoints endUserDocumentation="Adds support for EMF GenModel configuration." name="Generation" modelFileExtension="genmodel">
     <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage">
-      <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="&lt;%ecoreClass.name%>">
-        <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="&lt;%eAllContents(&quot;GenFeature&quot;)[ecoreFeature.filter(&quot;EAttribute&quot;) || (ecoreFeature.filter(&quot;EReference&quot;)  &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).containment &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).derived) ]%>" headerLabelExpression="&lt;%ecoreFeature.name%>">
-          <backgroundConditionalStyle predicateExpression="&lt;%propertyCategory == &quot;&quot;%>">
+      <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name">
+        <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="&lt;%eAllContents(&quot;GenFeature&quot;)[ecoreFeature.filter(&quot;EAttribute&quot;) || (ecoreFeature.filter(&quot;EReference&quot;)  &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).containment &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).derived) ]%>" headerLabelExpression="aql:self.ecoreFeature.name">
+          <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''">
             <style>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             </style>
@@ -1398,7 +1409,7 @@
     </ownedRepresentations>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1/description/base1.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1/description/base1.odesign
index 9362b8ae2f..865acc2ca2 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1/description/base1.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1/description/base1.odesign
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Base1" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Base1" version="10.0.0.201505222000">
   <ownedViewpoints name="Base1WithTemplate" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities1" titleExpression="&lt;%name%> package entities" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities1" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']/@subNodeMappings[name='TEC%20EAttribute'] //@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']/@subNodeMappings[name='TEC%20Operation']"/>
       </filters>
@@ -12,23 +12,23 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@edgeMappings[name='TEC_EReference%20Base1']"/>
       </filters>
       <validationSet>
-        <ownedRules xsi:type="validation:ViewValidationRule" message="The &lt;%target.name%> class is never used" targets="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']">
+        <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']">
           <audits auditExpression="&lt;%(((target + target.eAllSuperTypes).~.filter(&quot;EClass&quot;) + (target + target.eAllSuperTypes).~.filter(&quot;EReference&quot;) ) - target.eAllStructuralFeatures).nSize != 0%>"/>
         </ownedRules>
-        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The &lt;%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']">
-          <audits auditExpression="&lt;%target.eAllSuperTypes.nSize &lt; 4%>"/>
+        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']">
+          <audits auditExpression="aql:self.target.eAllSuperTypes->size() &lt; 4"/>
         </ownedRules>
       </validationSet>
       <defaultLayer name="Default">
-        <edgeMappings name="TEC_EReference Base1" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']" targetMapping="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="TEC_EReference Base1" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']" targetMapping="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%getEReferenceName()%>">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%getEReferenceName()%>">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -36,7 +36,7 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="TEC ESupertypes Base1" deletionDescription="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']" targetMapping="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="TEC ESupertypes Base1" deletionDescription="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']" targetMapping="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -44,7 +44,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="TEC EClass Base1" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <containerMappings name="TEC EClass Base1" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="TEC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
             <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -59,22 +59,23 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="&lt;%isDocumentedTemplate%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -82,7 +83,7 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="TEC EEnum Base1" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>" domainClass="EEnum" childrenPresentation="List">
+        <containerMappings name="TEC EEnum Base1" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List">
           <subNodeMappings name="TEC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnumLiteral">
             <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -90,14 +91,14 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
           <conditionnalStyles predicateExpression="&lt;%isDocumentedTemplate%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -105,8 +106,8 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="TEC EDataType Base1" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EDataType&quot;)%>" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="TEC EDataType Base1" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)" domainClass="EDataType" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -119,7 +120,7 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -163,7 +164,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -212,9 +213,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -224,8 +225,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="test" forceRefresh="true" id="ticket1622.base.javaActions1"/>
               </firstModelOperations>
             </initialOperation>
@@ -233,15 +234,15 @@
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Package">
-        <containerMappings name="Design Package" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1'] //@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="Design Package" labelDirectEdit="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1'] //@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
           <conditionnalStyles predicateExpression="&lt;%!isDocumentedTemplate%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -250,7 +251,7 @@
           </conditionnalStyles>
         </containerMappings>
         <containerMappings name="Dropped Package" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -264,7 +265,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package">
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:package">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Package &lt;%eContainer().eContents.filter(&quot;EPackage&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1ExtA/description/base1ExtA.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1ExtA/description/base1ExtA.odesign
index d7f474b5d3..c4ec7cf4af 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1ExtA/description/base1ExtA.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1ExtA/description/base1ExtA.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Base1ExtA" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Base1ExtA" version="10.0.0.201505222000">
   <ownedViewpoints name="Base1ExtA_withAcceleoTemplate" modelFileExtension="ecore">
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/ViewpointTestProjectBase1/Base1WithTemplate" representationName="Entities1">
       <layers name="Extension with acceleo template A">
@@ -9,8 +9,9 @@
           <reusedNodeMappings href="../../ViewpointTestProjectBase2/description/base2.odesign#//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']/@subNodeMappings[name='TEC%20Operation%20Base2']"/>
           <reusedNodeMappings href="../../ViewpointTestProjectBase2/description/base2.odesign#//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']/@subNodeMappings[name='TEC%20EAttribute%20Base2']"/>
           <conditionnalStyles predicateExpression="&lt;%isDocumentedOnlyInBase%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -22,8 +23,9 @@
       <layers name="Extension A - Use service define only in ExtA">
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class A2" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" childrenPresentation="List" hideSubMappings="true">
           <conditionnalStyles predicateExpression="&lt;%isDocumentedOnlyInExtA%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1ExtB/description/base1ExtB.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1ExtB/description/base1ExtB.odesign
index fdb37f5245..8fd0177cc2 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1ExtB/description/base1ExtB.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase1ExtB/description/base1ExtB.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Base1ExtB" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Base1ExtB" version="10.0.0.201505222000">
   <ownedViewpoints name="Base1ExtB_withAcceleoTemplate" modelFileExtension="ecore">
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/ViewpointTestProjectBase1/Base1WithTemplate" representationName="Entities1">
       <layers name="Extension with acceleo template B">
@@ -7,8 +7,9 @@
           <reusedNodeMappings href="../../ViewpointTestProjectBase1/description/base1.odesign#//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']/@subNodeMappings[name='TEC%20EAttribute']"/>
           <reusedNodeMappings href="../../ViewpointTestProjectBase1/description/base1.odesign#//@ownedViewpoints[name='Base1WithTemplate']/@ownedRepresentations[name='Entities1']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base1']/@subNodeMappings[name='TEC%20Operation']"/>
           <conditionnalStyles predicateExpression="&lt;%!isDocumentedTemplate &amp;&amp; isBTemplate%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase2/description/base2.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase2/description/base2.odesign
index f15778a1fd..81ecd308d3 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase2/description/base2.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase2/description/base2.odesign
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Base2" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Base2" version="10.0.0.201505222000">
   <ownedViewpoints name="Base2WithTemplate" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities2" titleExpression="&lt;%name%> package entities" domainClass="EPackage">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities2" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']/@subNodeMappings[name='TEC%20EAttribute%20Base2'] //@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']/@subNodeMappings[name='TEC%20Operation%20Base2']"/>
       </filters>
@@ -12,23 +12,23 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@edgeMappings[name='TEC_EReference%20Base2']"/>
       </filters>
       <validationSet>
-        <ownedRules xsi:type="validation:ViewValidationRule" message="The &lt;%target.name%> class is never used" targets="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']">
+        <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']">
           <audits auditExpression="&lt;%(((target + target.eAllSuperTypes).~.filter(&quot;EClass&quot;) + (target + target.eAllSuperTypes).~.filter(&quot;EReference&quot;) ) - target.eAllStructuralFeatures).nSize != 0%>"/>
         </ownedRules>
-        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The &lt;%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']">
-          <audits auditExpression="&lt;%target.eAllSuperTypes.nSize &lt; 4%>"/>
+        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']">
+          <audits auditExpression="aql:self.target.eAllSuperTypes->size() &lt; 4"/>
         </ownedRules>
       </validationSet>
       <defaultLayer name="Default">
-        <edgeMappings name="TEC_EReference Base2" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']" targetMapping="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="TEC_EReference Base2" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']" targetMapping="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%getEReferenceName()%>">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%getEReferenceName()%>">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -36,7 +36,7 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="TEC ESupertypes Base2" deletionDescription="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']" targetMapping="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="TEC ESupertypes Base2" deletionDescription="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']" targetMapping="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -44,7 +44,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="TEC EClass Base2" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <containerMappings name="TEC EClass Base2" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="TEC EAttribute Base2" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
             <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -59,22 +59,23 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="&lt;%isDocumentedTemplate%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -82,7 +83,7 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="TEC EEnum Base2" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>" domainClass="EEnum" childrenPresentation="List">
+        <containerMappings name="TEC EEnum Base2" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List">
           <subNodeMappings name="TEC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnumLiteral">
             <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -90,14 +91,14 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
           <conditionnalStyles predicateExpression="&lt;%isDocumentedTemplate%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -105,8 +106,8 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="TEC EDataType Base2" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EDataType&quot;)%>" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="TEC EDataType Base2" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)" domainClass="EDataType" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -119,7 +120,7 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -163,7 +164,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -212,9 +213,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -224,8 +225,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="test" forceRefresh="true" id="ticket1622.base.javaActions1"/>
               </firstModelOperations>
             </initialOperation>
@@ -233,15 +234,15 @@
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Package">
-        <containerMappings name="Design Package" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2'] //@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="Design Package" labelDirectEdit="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2'] //@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
           <conditionnalStyles predicateExpression="&lt;%!isDocumentedTemplate%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -250,7 +251,7 @@
           </conditionnalStyles>
         </containerMappings>
         <containerMappings name="Dropped Package" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -264,7 +265,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package">
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:package">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Package &lt;%eContainer().eContents.filter(&quot;EPackage&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase2ExtC/description/base2ExtC.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase2ExtC/description/base2ExtC.odesign
index 41cb453561..4b92c80acf 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase2ExtC/description/base2ExtC.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/javaextension/description/ViewpointTestProjectBase2ExtC/description/base2ExtC.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Base2ExtC" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Base2ExtC" version="10.0.0.201505222000">
   <ownedViewpoints name="Base2ExtC_withAcceleoTemplate" modelFileExtension="ecore">
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/ViewpointTestProjectBase1/Base1WithTemplate" representationName="Entities2">
       <layers name="Extension with acceleo template C">
@@ -7,8 +7,9 @@
           <reusedNodeMappings href="../../ViewpointTestProjectBase2/description/base2.odesign#//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']/@subNodeMappings[name='TEC%20EAttribute%20Base2']"/>
           <reusedNodeMappings href="../../ViewpointTestProjectBase2/description/base2.odesign#//@ownedViewpoints[name='Base2WithTemplate']/@ownedRepresentations[name='Entities2']/@defaultLayer/@containerMappings[name='TEC%20EClass%20Base2']/@subNodeMappings[name='TEC%20Operation%20Base2']"/>
           <conditionnalStyles predicateExpression="&lt;%isDocumentedTemplate%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/add_edge_mapping.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/add_edge_mapping.odesign
index 46ded508e3..edebe67fba 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/add_edge_mapping.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/add_edge_mapping.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="10.0.0.201505222000">
   <ownedViewpoints name="V">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" domainClass="EPackage">
       <defaultLayer name="Default">
@@ -17,7 +17,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="Ref" sourceMapping="//@ownedViewpoints[name='V']/@ownedRepresentations[name='D']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='V']/@ownedRepresentations[name='D']/@defaultLayer/@nodeMappings[name='Class']" targetFinderExpression="&lt;%eAllReferences.eType%>">
+        <edgeMappings name="Ref" sourceMapping="//@ownedViewpoints[name='V']/@ownedRepresentations[name='D']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='V']/@ownedRepresentations[name='D']/@defaultLayer/@nodeMappings[name='Class']" targetFinderExpression="aql:self.eAllReferences.eType">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/add_layer.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/add_layer.odesign
index dc531e6e64..53e25f2671 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/add_layer.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/add_layer.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="10.0.0.201505222000">
   <ownedViewpoints name="V">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" domainClass="EPackage">
       <defaultLayer name="Default">
@@ -28,8 +28,8 @@
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Opt">
-        <containerMappings name="Class2" semanticCandidatesExpression="&lt;%foo%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription">
+        <containerMappings name="Class2" semanticCandidatesExpression="aql:self.foo" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/change_attributes.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/change_attributes.odesign
index 5035064d76..8bdea0dd45 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/change_attributes.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/change_attributes.odesign
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="10.0.0.201505222000">
   <ownedViewpoints name="V" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" initialisation="true" showOnStartup="true" domainClass="EPackage" preconditionExpression="&lt;%someTest%>" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" initialisation="true" showOnStartup="true" domainClass="EPackage" preconditionExpression="aql:self.someTest" enablePopupBars="true">
       <defaultLayer name="Default">
         <nodeMappings name="Class" semanticCandidatesExpression="feature:eContents" createElements="false" domainClass="EClass">
-          <style xsi:type="style:SquareDescription" labelFormat="italic" labelAlignment="LEFT" sizeComputationExpression="6" labelPosition="node" resizeKind="NSEW" width="2" height="2">
+          <style xsi:type="style:SquareDescription" labelAlignment="LEFT" sizeComputationExpression="6" labelPosition="node" resizeKind="NSEW" width="2" height="2">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+            <labelFormat>italic</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           </style>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/contribution_tests.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/contribution_tests.odesign
index c1b613cb1a..df623f360b 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/contribution_tests.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/contribution_tests.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="10.0.0.201505222000">
   <ownedViewpoints name="V">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" domainClass="EPackage">
       <defaultLayer name="Default">
@@ -30,7 +30,7 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DExt" domainClass="EPackage">
       <defaultLayer name="Default">
-        <nodeMappings name="Attr" semanticCandidatesExpression="&lt;%eStructuralFeatures%>" domainClass="EAttribute">
+        <nodeMappings name="Attr" semanticCandidatesExpression="aql:self.eStructuralFeatures" domainClass="EAttribute">
           <style xsi:type="style:SquareDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign
index 6c4bfac705..a15924398d 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_2="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0" name="Interaction" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_2="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0" name="Interaction" version="10.0.0.201505222000">
   <ownedViewpoints endUserDocumentation="Provides diagrams to model interactions between Ecore elements." name="Interactions" label="Interactions" modelFileExtension="interactions">
-    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="Sequence Diagram on &lt;%name%>" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
+    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="aql'Sequence Diagram on ' + self.name" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
       <filters xsi:type="filter:CompositeFilterDescription" name="CollapseExec" label="Collapse Executions">
         <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']"/>
       </filters>
       <defaultLayer name="Default">
-        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="&lt;%participants%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
+        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="aql:self.participants" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
           <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Lifeline" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant" startingEndFinderExpression="var:self" finishingEndFinderExpression="var:self">
-            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="" resizeKind="NORTH_SOUTH" width="2" height="5" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Interpolated%20blue%20for%20Executions']">
                 <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']"/>
               </style>
             </borderedNodeMappings>
-            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Skyblue']/@entries[name='High_Skyblue']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
-              <conditionnalStyles predicateExpression="&lt;%start == end%>">
+              <conditionnalStyles predicateExpression="aql:self.start = self.end">
                 <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Flabber%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Lavonne']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
               </conditionnalStyles>
             </borderedNodeMappings>
             <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="EOL" preconditionExpression="&lt;%eContainer(&quot;Interaction&quot;).messages.filter(&quot;DestroyParticipantMessage&quot;).receivingEnd[context == current(&quot;Participant&quot;)]%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EndOfLife']" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
-              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
+              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
@@ -39,8 +39,9 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelSize="12" labelFormat="bold" showIcon="false" labelExpression="&lt;%name%> : &lt;%type.name%>" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
+          <style xsi:type="style:SquareDescription" labelSize="12" showIcon="false" labelExpression="aql:self.name + ' : ' + self.type.name" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
@@ -52,56 +53,56 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%isWrite%>">
-            <style sizeComputationExpression="&lt;%2%>">
+          <conditionnalStyles predicateExpression="aql:self.isWrite">
+            <style sizeComputationExpression="2">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
-          <style lineStyle="dot">
+        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
+          <style lineStyle="dot" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="&lt;%startingEnd%>" finishingEndFinderExpression="&lt;%finishingEnd%>" coveredLifelinesExpression="&lt;%coveredParticipants%>" centerLabelExpression="call(&lt;%interaction.name%>)">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%type%>" labelAlignment="LEFT">
+        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="aql:self.startingEnd" finishingEndFinderExpression="aql:self.finishingEnd" coveredLifelinesExpression="aql:self.coveredParticipants" centerLabelExpression="aql:'call(' + self.interaction.name + ')'">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.type" labelAlignment="LEFT">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -109,11 +110,11 @@
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
-        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%finish%>" coveredLifelinesExpression="&lt;%coveredParticipants%>">
-          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="&lt;%ownedOperands%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%getFinishingEnd()%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
+        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants">
+          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="&lt;%operator%>" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
@@ -135,50 +136,50 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$sendingEnd.context%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:sendingEnd.context"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -196,13 +197,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -236,37 +237,37 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -280,13 +281,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -311,19 +312,19 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -333,23 +334,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -362,20 +363,20 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" containerViewExpression="var:targetView"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -385,23 +386,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -416,19 +417,19 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="finishingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -438,23 +439,23 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:finishingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="s&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="'s' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +  self.state.name"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +  self.state.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -469,15 +470,15 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -487,14 +488,14 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="ps&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'ps' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="middle_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'middle_' + self.state.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -510,21 +511,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -534,23 +535,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -563,22 +564,22 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -588,23 +589,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -617,21 +618,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -641,23 +642,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -670,21 +671,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -694,23 +695,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new return message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -725,19 +726,19 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Execution creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="startingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="finishingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -747,23 +748,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:finishingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:startingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new execution position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.1/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -777,22 +778,22 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="IU creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUse" referenceName="interactionUses" variableName="newIU">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="ref.&lt;%eContainer.eContents.filter(&quot;InteractionUse&quot;).nSize%>"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="aql:'ref.' + self.eContainer().eContents()->filter(InteractionUse)->size()"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="aql:self.eContainerOrSelf(Interaction)"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="startingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="finishingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
@@ -803,13 +804,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust interaction use position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.4/@subModelOperations.2"/>
@@ -824,10 +825,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="CF creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragment" referenceName="combinedFragments" variableName="newCF">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operator" valueExpression="alt.&lt;%eContainer.eContents.filter(&quot;CombinedFragment&quot;).nSize%>"/>
@@ -837,15 +838,15 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="startCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="finishCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newCF">
@@ -859,19 +860,19 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move newOpEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startCF" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -883,10 +884,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Operand Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;CombinedFragment&quot;)%>">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand">
@@ -894,7 +895,7 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newOperand">
@@ -904,10 +905,10 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move operand" id="org.eclipse.sirius.business.api.action.moveElement">
-                  <parameters name="referenceOwner" value="&lt;%$newOperand.eContainer%>"/>
+                  <parameters name="referenceOwner" value="aql:newOperand.eContainer()"/>
                   <parameters name="referenceName" value="ownedOperands"/>
                   <parameters name="element" value="var:newOperand"/>
                   <parameters name="predecessor" value="&lt;%(($newOperand.start.precedingSibling.nReverse.filter(&quot;OperandEnd&quot;) &amp;&amp; $newOperand.eContainer.ownedOperands.start).nFirst).owner%>"/>
@@ -939,24 +940,24 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:For" expression="&lt;%$element.~context%>" iteratorName="end">
+                <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.execution%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.message%>">
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%current.sendingEnd == $end &amp;&amp; !current.receivingEnd%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%!current.sendingEnd  &amp;&amp; current.receivingEnd == $end%>">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd =null   and  self.receivingEnd = end">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.state%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
@@ -973,11 +974,11 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_' + arg0"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + arg0"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -988,12 +989,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -1010,12 +1011,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -1038,12 +1039,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%start != end%>">
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.start &lt;> self.end">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -1059,121 +1060,121 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Event reordering"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Execution&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Execution)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust execution position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="executions"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.ExecutionEnd&quot;)[current.execution.start == current].nLast.execution%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;State&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(State)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust state position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="states"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.StateEnd&quot;)[current.state.start == current].nLast.state%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Message&quot;)%>">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Message)">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sending end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.sendingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.sendingEnd"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.receivingEnd%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.receivingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receiving end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.receivingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.receivingEnd"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust message position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="messages"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.sendingEnd.precedingSibling.filter(&quot;interactions.MessageEnd&quot;)[current.message.receivingEnd == current].nLast.message%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;InteractionUse&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(InteractionUse)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Interaction Use position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="interactionUses"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.InteractionUseEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;CombinedFragment&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(CombinedFragment)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust CombinedFragment position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="combinedFragments"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.CombinedFragmentEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Operand&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Operand)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Operand position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;CombinedFragment&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainer(CombinedFragment)"/>
                     <parameters name="referenceName" value="ownedOperands"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.OperandEnd&quot;)[current.owner.start == current &amp;&amp; current(1).eContainer(&quot;interactions.CombinedFragment&quot;) == current().owner.eContainer(&quot;interactions.CombinedFragment&quot;)].nLast.owner%>"/>
@@ -1198,10 +1199,10 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%finish%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.finish">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -1223,7 +1224,7 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteCombinedFragment()%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteCombinedFragment()"/>
             </initialOperation>
           </ownedTools>
           <subSections name="Operands">
@@ -1240,7 +1241,7 @@
               <elementView name="elementView"/>
               <containerView name="containerView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteOperand()%>"/>
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteOperand()"/>
               </initialOperation>
             </ownedTools>
           </subSections>
@@ -1252,21 +1253,21 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1275,7 +1276,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
@@ -1287,15 +1288,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1304,14 +1305,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1320,15 +1321,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1337,14 +1338,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1354,17 +1355,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1373,14 +1374,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1389,18 +1390,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1409,14 +1410,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1425,17 +1426,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1444,14 +1445,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1463,40 +1464,40 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -1512,7 +1513,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -1536,33 +1537,33 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -1575,7 +1576,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -1596,15 +1597,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -1613,14 +1614,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1629,15 +1630,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -1646,14 +1647,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1663,17 +1664,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -1682,14 +1683,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1698,18 +1699,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -1718,14 +1719,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1734,17 +1735,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -1753,14 +1754,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1773,27 +1774,27 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.sample.interactions.services.helpers"/>
   </ownedViewpoints>
   <ownedViewpoints endUserDocumentation="Provides diagrams to model interactions between Ecore elements." name="Interactions_Copy1" label="Interactions_Copy1" modelFileExtension="interactions">
-    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="Sequence Diagram on &lt;%name%>" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
+    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="aql'Sequence Diagram on ' + self.name" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
       <filters xsi:type="filter:CompositeFilterDescription" name="CollapseExec" label="Collapse Executions">
         <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']"/>
       </filters>
       <defaultLayer name="Default">
-        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="&lt;%participants%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
+        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="aql:self.participants" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
           <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Lifeline" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant" startingEndFinderExpression="var:self" finishingEndFinderExpression="var:self">
-            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="" resizeKind="NORTH_SOUTH" width="2" height="5" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Interpolated%20blue%20for%20Executions']">
                 <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']"/>
               </style>
             </borderedNodeMappings>
-            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Skyblue']/@entries[name='High_Skyblue']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
-              <conditionnalStyles predicateExpression="&lt;%start == end%>">
+              <conditionnalStyles predicateExpression="aql:self.start = self.end">
                 <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Flabber%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Lavonne']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
               </conditionnalStyles>
             </borderedNodeMappings>
             <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="EOL" preconditionExpression="&lt;%eContainer(&quot;Interaction&quot;).messages.filter(&quot;DestroyParticipantMessage&quot;).receivingEnd[context == current(&quot;Participant&quot;)]%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EndOfLife']" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
-              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
+              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
@@ -1811,8 +1812,9 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelSize="12" labelFormat="bold" showIcon="false" labelExpression="&lt;%name%> : &lt;%type.name%>" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
+          <style xsi:type="style:SquareDescription" labelSize="12" showIcon="false" labelExpression="aql:self.name + ' : ' + self.type.name" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
@@ -1824,56 +1826,56 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%isWrite%>">
-            <style sizeComputationExpression="&lt;%2%>">
+          <conditionnalStyles predicateExpression="aql:self.isWrite">
+            <style sizeComputationExpression="2">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
-          <style lineStyle="dot">
+        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
+          <style lineStyle="dot" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="&lt;%startingEnd%>" finishingEndFinderExpression="&lt;%finishingEnd%>" coveredLifelinesExpression="&lt;%coveredParticipants%>" centerLabelExpression="call(&lt;%interaction.name%>)">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%type%>" labelAlignment="LEFT">
+        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="aql:self.startingEnd" finishingEndFinderExpression="aql:self.finishingEnd" coveredLifelinesExpression="aql:self.coveredParticipants" centerLabelExpression="aql:'call(' + self.interaction.name + ')'">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.type" labelAlignment="LEFT">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -1881,11 +1883,11 @@
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
-        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%finish%>" coveredLifelinesExpression="&lt;%coveredParticipants%>">
-          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="&lt;%ownedOperands%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%getFinishingEnd()%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
+        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants">
+          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="&lt;%operator%>" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
@@ -1907,50 +1909,50 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$sendingEnd.context%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:sendingEnd.context"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1968,13 +1970,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -2008,37 +2010,37 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2052,13 +2054,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -2083,19 +2085,19 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2105,23 +2107,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -2134,20 +2136,20 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" containerViewExpression="var:targetView"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2157,23 +2159,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -2188,19 +2190,19 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="finishingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -2210,23 +2212,23 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:finishingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="s&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="'s' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +  self.state.name"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +  self.state.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -2241,15 +2243,15 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -2259,14 +2261,14 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="ps&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'ps' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="middle_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'middle_' + self.state.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -2282,21 +2284,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2306,23 +2308,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -2335,22 +2337,22 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2360,23 +2362,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -2389,21 +2391,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2413,23 +2415,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -2442,21 +2444,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2466,23 +2468,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new return message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -2497,19 +2499,19 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Execution creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="startingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="finishingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -2519,23 +2521,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:finishingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:startingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new execution position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.1/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -2549,22 +2551,22 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="IU creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUse" referenceName="interactionUses" variableName="newIU">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="ref.&lt;%eContainer.eContents.filter(&quot;InteractionUse&quot;).nSize%>"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="aql:'ref.' + self.eContainer().eContents()->filter(InteractionUse)->size()"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="aql:self.eContainerOrSelf(Interaction)"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="startingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="finishingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
@@ -2575,13 +2577,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust interaction use position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.4/@subModelOperations.2"/>
@@ -2596,10 +2598,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="CF creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragment" referenceName="combinedFragments" variableName="newCF">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operator" valueExpression="alt.&lt;%eContainer.eContents.filter(&quot;CombinedFragment&quot;).nSize%>"/>
@@ -2609,15 +2611,15 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="startCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="finishCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newCF">
@@ -2631,19 +2633,19 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move newOpEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startCF" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -2655,10 +2657,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Operand Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;CombinedFragment&quot;)%>">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand">
@@ -2666,7 +2668,7 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newOperand">
@@ -2676,10 +2678,10 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move operand" id="org.eclipse.sirius.business.api.action.moveElement">
-                  <parameters name="referenceOwner" value="&lt;%$newOperand.eContainer%>"/>
+                  <parameters name="referenceOwner" value="aql:newOperand.eContainer()"/>
                   <parameters name="referenceName" value="ownedOperands"/>
                   <parameters name="element" value="var:newOperand"/>
                   <parameters name="predecessor" value="&lt;%(($newOperand.start.precedingSibling.nReverse.filter(&quot;OperandEnd&quot;) &amp;&amp; $newOperand.eContainer.ownedOperands.start).nFirst).owner%>"/>
@@ -2711,24 +2713,24 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:For" expression="&lt;%$element.~context%>" iteratorName="end">
+                <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.execution%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.message%>">
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%current.sendingEnd == $end &amp;&amp; !current.receivingEnd%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%!current.sendingEnd  &amp;&amp; current.receivingEnd == $end%>">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd =null   and  self.receivingEnd = end">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.state%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
@@ -2745,11 +2747,11 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_' + arg0"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + arg0"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -2760,12 +2762,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -2782,12 +2784,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -2810,12 +2812,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%start != end%>">
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.start &lt;> self.end">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -2831,121 +2833,121 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Event reordering"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Execution&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Execution)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust execution position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="executions"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.ExecutionEnd&quot;)[current.execution.start == current].nLast.execution%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;State&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(State)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust state position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="states"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.StateEnd&quot;)[current.state.start == current].nLast.state%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Message&quot;)%>">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Message)">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sending end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.sendingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.sendingEnd"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.receivingEnd%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.receivingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receiving end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.receivingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.receivingEnd"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust message position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="messages"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.sendingEnd.precedingSibling.filter(&quot;interactions.MessageEnd&quot;)[current.message.receivingEnd == current].nLast.message%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;InteractionUse&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(InteractionUse)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Interaction Use position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="interactionUses"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.InteractionUseEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;CombinedFragment&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(CombinedFragment)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust CombinedFragment position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="combinedFragments"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.CombinedFragmentEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Operand&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Operand)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Operand position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;CombinedFragment&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainer(CombinedFragment)"/>
                     <parameters name="referenceName" value="ownedOperands"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.OperandEnd&quot;)[current.owner.start == current &amp;&amp; current(1).eContainer(&quot;interactions.CombinedFragment&quot;) == current().owner.eContainer(&quot;interactions.CombinedFragment&quot;)].nLast.owner%>"/>
@@ -2970,10 +2972,10 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%finish%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.finish">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -2995,7 +2997,7 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteCombinedFragment()%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteCombinedFragment()"/>
             </initialOperation>
           </ownedTools>
           <subSections name="Operands">
@@ -3012,7 +3014,7 @@
               <elementView name="elementView"/>
               <containerView name="containerView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteOperand()%>"/>
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteOperand()"/>
               </initialOperation>
             </ownedTools>
           </subSections>
@@ -3024,21 +3026,21 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3047,7 +3049,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
@@ -3059,15 +3061,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3076,14 +3078,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3092,15 +3094,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3109,14 +3111,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3126,17 +3128,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3145,14 +3147,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3161,18 +3163,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3181,14 +3183,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3197,17 +3199,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3216,14 +3218,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3235,40 +3237,40 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -3284,7 +3286,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -3308,33 +3310,33 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -3347,7 +3349,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -3368,15 +3370,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -3385,14 +3387,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3401,15 +3403,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -3418,14 +3420,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3435,17 +3437,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -3454,14 +3456,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3470,18 +3472,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -3490,14 +3492,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3506,17 +3508,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -3525,14 +3527,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3545,27 +3547,27 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.sample.interactions.services.helpers"/>
   </ownedViewpoints>
   <ownedViewpoints endUserDocumentation="Provides diagrams to model interactions between Ecore elements." name="Interactions_Copy2" label="Interactions_Copy2" modelFileExtension="interactions">
-    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="Sequence Diagram on &lt;%name%>" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
+    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="aql'Sequence Diagram on ' + self.name" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
       <filters xsi:type="filter:CompositeFilterDescription" name="CollapseExec" label="Collapse Executions">
         <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']"/>
       </filters>
       <defaultLayer name="Default">
-        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="&lt;%participants%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
+        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="aql:self.participants" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
           <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Lifeline" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant" startingEndFinderExpression="var:self" finishingEndFinderExpression="var:self">
-            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="" resizeKind="NORTH_SOUTH" width="2" height="5" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Interpolated%20blue%20for%20Executions']">
                 <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']"/>
               </style>
             </borderedNodeMappings>
-            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Skyblue']/@entries[name='High_Skyblue']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
-              <conditionnalStyles predicateExpression="&lt;%start == end%>">
+              <conditionnalStyles predicateExpression="aql:self.start = self.end">
                 <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Flabber%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Lavonne']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
               </conditionnalStyles>
             </borderedNodeMappings>
             <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="EOL" preconditionExpression="&lt;%eContainer(&quot;Interaction&quot;).messages.filter(&quot;DestroyParticipantMessage&quot;).receivingEnd[context == current(&quot;Participant&quot;)]%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EndOfLife']" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
-              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
+              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
@@ -3583,8 +3585,9 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelSize="12" labelFormat="bold" showIcon="false" labelExpression="&lt;%name%> : &lt;%type.name%>" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
+          <style xsi:type="style:SquareDescription" labelSize="12" showIcon="false" labelExpression="aql:self.name + ' : ' + self.type.name" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
@@ -3596,56 +3599,56 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%isWrite%>">
-            <style sizeComputationExpression="&lt;%2%>">
+          <conditionnalStyles predicateExpression="aql:self.isWrite">
+            <style sizeComputationExpression="2">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
-          <style lineStyle="dot">
+        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
+          <style lineStyle="dot" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="&lt;%startingEnd%>" finishingEndFinderExpression="&lt;%finishingEnd%>" coveredLifelinesExpression="&lt;%coveredParticipants%>" centerLabelExpression="call(&lt;%interaction.name%>)">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%type%>" labelAlignment="LEFT">
+        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="aql:self.startingEnd" finishingEndFinderExpression="aql:self.finishingEnd" coveredLifelinesExpression="aql:self.coveredParticipants" centerLabelExpression="aql:'call(' + self.interaction.name + ')'">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.type" labelAlignment="LEFT">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -3653,11 +3656,11 @@
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
-        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%finish%>" coveredLifelinesExpression="&lt;%coveredParticipants%>">
-          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="&lt;%ownedOperands%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%getFinishingEnd()%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
+        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants">
+          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="&lt;%operator%>" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
@@ -3679,50 +3682,50 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$sendingEnd.context%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:sendingEnd.context"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3740,13 +3743,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -3780,37 +3783,37 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3824,13 +3827,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -3855,19 +3858,19 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3877,23 +3880,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3906,20 +3909,20 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" containerViewExpression="var:targetView"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3929,23 +3932,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3960,19 +3963,19 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="finishingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -3982,23 +3985,23 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:finishingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="s&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="'s' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +  self.state.name"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +  self.state.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -4013,15 +4016,15 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -4031,14 +4034,14 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="ps&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'ps' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="middle_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'middle_' + self.state.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -4054,21 +4057,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4078,23 +4081,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4107,22 +4110,22 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4132,23 +4135,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4161,21 +4164,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4185,23 +4188,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4214,21 +4217,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4238,23 +4241,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new return message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4269,19 +4272,19 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Execution creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="startingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="finishingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -4291,23 +4294,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:finishingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:startingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new execution position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.1/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -4321,22 +4324,22 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="IU creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUse" referenceName="interactionUses" variableName="newIU">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="ref.&lt;%eContainer.eContents.filter(&quot;InteractionUse&quot;).nSize%>"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="aql:'ref.' + self.eContainer().eContents()->filter(InteractionUse)->size()"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="aql:self.eContainerOrSelf(Interaction)"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="startingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="finishingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
@@ -4347,13 +4350,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust interaction use position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.4/@subModelOperations.2"/>
@@ -4368,10 +4371,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="CF creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragment" referenceName="combinedFragments" variableName="newCF">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operator" valueExpression="alt.&lt;%eContainer.eContents.filter(&quot;CombinedFragment&quot;).nSize%>"/>
@@ -4381,15 +4384,15 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="startCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="finishCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newCF">
@@ -4403,19 +4406,19 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move newOpEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startCF" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -4427,10 +4430,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Operand Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;CombinedFragment&quot;)%>">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand">
@@ -4438,7 +4441,7 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newOperand">
@@ -4448,10 +4451,10 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move operand" id="org.eclipse.sirius.business.api.action.moveElement">
-                  <parameters name="referenceOwner" value="&lt;%$newOperand.eContainer%>"/>
+                  <parameters name="referenceOwner" value="aql:newOperand.eContainer()"/>
                   <parameters name="referenceName" value="ownedOperands"/>
                   <parameters name="element" value="var:newOperand"/>
                   <parameters name="predecessor" value="&lt;%(($newOperand.start.precedingSibling.nReverse.filter(&quot;OperandEnd&quot;) &amp;&amp; $newOperand.eContainer.ownedOperands.start).nFirst).owner%>"/>
@@ -4483,24 +4486,24 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:For" expression="&lt;%$element.~context%>" iteratorName="end">
+                <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.execution%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.message%>">
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%current.sendingEnd == $end &amp;&amp; !current.receivingEnd%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%!current.sendingEnd  &amp;&amp; current.receivingEnd == $end%>">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd =null   and  self.receivingEnd = end">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.state%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
@@ -4517,11 +4520,11 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_' + arg0"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + arg0"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -4532,12 +4535,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -4554,12 +4557,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -4582,12 +4585,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%start != end%>">
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.start &lt;> self.end">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -4603,121 +4606,121 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Event reordering"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Execution&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Execution)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust execution position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="executions"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.ExecutionEnd&quot;)[current.execution.start == current].nLast.execution%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;State&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(State)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust state position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="states"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.StateEnd&quot;)[current.state.start == current].nLast.state%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Message&quot;)%>">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Message)">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sending end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.sendingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.sendingEnd"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.receivingEnd%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.receivingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receiving end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.receivingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.receivingEnd"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust message position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="messages"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.sendingEnd.precedingSibling.filter(&quot;interactions.MessageEnd&quot;)[current.message.receivingEnd == current].nLast.message%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;InteractionUse&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(InteractionUse)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Interaction Use position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="interactionUses"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.InteractionUseEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;CombinedFragment&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(CombinedFragment)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust CombinedFragment position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="combinedFragments"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.CombinedFragmentEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Operand&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Operand)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Operand position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;CombinedFragment&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainer(CombinedFragment)"/>
                     <parameters name="referenceName" value="ownedOperands"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.OperandEnd&quot;)[current.owner.start == current &amp;&amp; current(1).eContainer(&quot;interactions.CombinedFragment&quot;) == current().owner.eContainer(&quot;interactions.CombinedFragment&quot;)].nLast.owner%>"/>
@@ -4742,10 +4745,10 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%finish%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.finish">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -4767,7 +4770,7 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteCombinedFragment()%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteCombinedFragment()"/>
             </initialOperation>
           </ownedTools>
           <subSections name="Operands">
@@ -4784,7 +4787,7 @@
               <elementView name="elementView"/>
               <containerView name="containerView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteOperand()%>"/>
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteOperand()"/>
               </initialOperation>
             </ownedTools>
           </subSections>
@@ -4796,21 +4799,21 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4819,7 +4822,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
@@ -4831,15 +4834,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4848,14 +4851,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -4864,15 +4867,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4881,14 +4884,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -4898,17 +4901,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4917,14 +4920,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4933,18 +4936,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4953,14 +4956,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4969,17 +4972,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4988,14 +4991,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -5007,40 +5010,40 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -5056,7 +5059,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -5080,33 +5083,33 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -5119,7 +5122,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -5140,15 +5143,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -5157,14 +5160,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -5173,15 +5176,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -5190,14 +5193,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -5207,17 +5210,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -5226,14 +5229,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -5242,18 +5245,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -5262,14 +5265,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -5278,17 +5281,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -5297,14 +5300,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -5329,7 +5332,7 @@
     <entries xsi:type="description:UserFixedColor" red="126" green="206" blue="202" name="Seabluff"/>
     <entries xsi:type="description:UserFixedColor" red="160" green="222" blue="214" name="Paleolitico"/>
     <entries xsi:type="description:UserFixedColor" red="199" green="237" blue="232" name="Glint on the ocean"/>
-    <entries xsi:type="description:InterpolatedColor" name="Interpolated blue for Executions" colorValueComputationExpression="&lt;%computeExecutionDepth()%>">
+    <entries xsi:type="description:InterpolatedColor" name="Interpolated blue for Executions" colorValueComputationExpression="aql:self.computeExecutionDepth()">
       <colorSteps associatedValue="0" associatedColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Glint%20on%20the%20ocean']"/>
       <colorSteps associatedValue="10" associatedColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']"/>
     </entries>
@@ -5339,7 +5342,7 @@
     <entries xsi:type="description:UserFixedColor" red="166" green="227" blue="187" name="Watery Green"/>
     <entries xsi:type="description:UserFixedColor" red="186" green="250" blue="158" name="Gentler Spring"/>
     <entries xsi:type="description:UserFixedColor" red="16" green="120" blue="103" name="Flabber Green"/>
-    <entries xsi:type="description:InterpolatedColor" name="Interpolated green for Combined Fragments" colorValueComputationExpression="&lt;%computeCombinedFragmentDepth()%>">
+    <entries xsi:type="description:InterpolatedColor" name="Interpolated green for Combined Fragments" colorValueComputationExpression="aql:self.computeCombinedFragmentDepth()">
       <colorSteps associatedValue="0" associatedColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']"/>
       <colorSteps associatedValue="5" associatedColor="//@userColorsPalettes[name='Greens']/@entries[name='Flabber%20Green']"/>
     </entries>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign
index 93c9b3c7d1..da2cd72583 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_2="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="Interaction" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_2="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="Interaction" version="10.0.0.201505222000">
   <ownedViewpoints endUserDocumentation="Provides diagrams to model interactions between Ecore elements." name="Interactions" label="Interactions" modelFileExtension="interactions">
-    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="Sequence Diagram on &lt;%name%>" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
+    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="aql'Sequence Diagram on ' + self.name" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
       <filters xsi:type="filter:CompositeFilterDescription" name="CollapseExec" label="Collapse Executions">
         <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']"/>
       </filters>
       <defaultLayer name="Default">
-        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.1/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.1/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="&lt;%participants%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
+        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.1/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.1/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="aql:self.participants" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
           <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Lifeline" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant" startingEndFinderExpression="var:self" finishingEndFinderExpression="var:self">
-            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="" resizeKind="NORTH_SOUTH" width="2" height="5" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Interpolated%20blue%20for%20Executions']">
                 <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']"/>
               </style>
             </borderedNodeMappings>
-            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Skyblue']/@entries[name='High_Skyblue']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
-              <conditionnalStyles predicateExpression="&lt;%start == end%>">
+              <conditionnalStyles predicateExpression="aql:self.start = self.end">
                 <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Flabber%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Lavonne']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
               </conditionnalStyles>
             </borderedNodeMappings>
             <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="EOL" preconditionExpression="&lt;%eContainer(&quot;Interaction&quot;).messages.filter(&quot;DestroyParticipantMessage&quot;).receivingEnd[context == current(&quot;Participant&quot;)]%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.1/@ownedTools[name='Delete%20EndOfLife']" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
-              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
+              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
@@ -39,8 +39,9 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelSize="12" labelFormat="bold" showIcon="false" labelExpression="&lt;%name%> : &lt;%type.name%>" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
+          <style xsi:type="style:SquareDescription" labelSize="12" showIcon="false" labelExpression="aql:self.name + ' : ' + self.type.name" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
@@ -52,56 +53,56 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%isWrite%>">
-            <style sizeComputationExpression="&lt;%2%>">
+          <conditionnalStyles predicateExpression="aql:self.isWrite">
+            <style sizeComputationExpression="2">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
-          <style lineStyle="dot">
+        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
+          <style lineStyle="dot" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="&lt;%startingEnd%>" finishingEndFinderExpression="&lt;%finishingEnd%>" coveredLifelinesExpression="&lt;%coveredParticipants%>" centerLabelExpression="call(&lt;%interaction.name%>)">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%type%>" labelAlignment="LEFT">
+        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="aql:self.startingEnd" finishingEndFinderExpression="aql:self.finishingEnd" coveredLifelinesExpression="aql:self.coveredParticipants" centerLabelExpression="aql:'call(' + self.interaction.name + ')'">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.type" labelAlignment="LEFT">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -109,11 +110,11 @@
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
-        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%finish%>" coveredLifelinesExpression="&lt;%coveredParticipants%>">
-          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="&lt;%ownedOperands%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%getFinishingEnd()%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
+        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants">
+          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="&lt;%operator%>" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
@@ -122,22 +123,22 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="IU creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUse" referenceName="interactionUses" variableName="newIU">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="ref.&lt;%eContainer.eContents.filter(&quot;InteractionUse&quot;).nSize%>"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="aql:'ref.' + self.eContainer().eContents()->filter(InteractionUse)->size()"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="aql:self.eContainerOrSelf(Interaction)"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="startingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="finishingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
@@ -148,13 +149,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust interaction use position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.4/@subModelOperations.2"/>
@@ -169,10 +170,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="CF creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragment" referenceName="combinedFragments" variableName="newCF">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operator" valueExpression="alt.&lt;%eContainer.eContents.filter(&quot;CombinedFragment&quot;).nSize%>"/>
@@ -182,15 +183,15 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="startCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="finishCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newCF">
@@ -204,19 +205,19 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move newOpEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startCF" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -228,10 +229,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Operand Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;CombinedFragment&quot;)%>">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand">
@@ -239,7 +240,7 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newOperand">
@@ -249,10 +250,10 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move operand" id="org.eclipse.sirius.business.api.action.moveElement">
-                  <parameters name="referenceOwner" value="&lt;%$newOperand.eContainer%>"/>
+                  <parameters name="referenceOwner" value="aql:newOperand.eContainer()"/>
                   <parameters name="referenceName" value="ownedOperands"/>
                   <parameters name="element" value="var:newOperand"/>
                   <parameters name="predecessor" value="&lt;%(($newOperand.start.precedingSibling.nReverse.filter(&quot;OperandEnd&quot;) &amp;&amp; $newOperand.eContainer.ownedOperands.start).nFirst).owner%>"/>
@@ -284,24 +285,24 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:For" expression="&lt;%$element.~context%>" iteratorName="end">
+                <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.execution%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.message%>">
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%current.sendingEnd == $end &amp;&amp; !current.receivingEnd%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%!current.sendingEnd  &amp;&amp; current.receivingEnd == $end%>">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd =null   and  self.receivingEnd = end">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.state%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
@@ -329,50 +330,50 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$sendingEnd.context%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:sendingEnd.context"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -390,13 +391,13 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:startExec"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
@@ -430,37 +431,37 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -474,13 +475,13 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:startExec"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
@@ -505,19 +506,19 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Creation Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -527,23 +528,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                    <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -556,20 +557,20 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Destruction Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_2:CreateView" mapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" containerViewExpression="var:targetView"/>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -579,23 +580,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                    <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -610,19 +611,19 @@
                   <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                       <parameters name="title" value="Execution creation"/>
-                      <parameters name="enabled" value="&lt;%false%>"/>
+                      <parameters name="enabled" value="aql:false"/>
                     </subModelOperations>
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                       <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                         <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="finishingEnd">
                         <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                         <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -632,23 +633,23 @@
                         <parameters name="referenceOwner" value="var:self"/>
                         <parameters name="referenceName" value="ends"/>
                         <parameters name="element" value="var:finishingEnd"/>
-                        <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                        <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                         <parameters name="referenceOwner" value="var:self"/>
                         <parameters name="referenceName" value="ends"/>
                         <parameters name="element" value="var:startingEnd"/>
-                        <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                        <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                         <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="s&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="'s' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%state.name%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +  self.state.name"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%state.name%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +  self.state.name"/>
                       </subModelOperations>
                     </subModelOperations>
                   </firstModelOperations>
@@ -663,15 +664,15 @@
                   <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                       <parameters name="title" value="Execution creation"/>
-                      <parameters name="enabled" value="&lt;%false%>"/>
+                      <parameters name="enabled" value="aql:false"/>
                     </subModelOperations>
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                       <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                         <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                         <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -681,14 +682,14 @@
                         <parameters name="referenceOwner" value="var:self"/>
                         <parameters name="referenceName" value="ends"/>
                         <parameters name="element" value="var:startingEnd"/>
-                        <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                        <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                         <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="ps&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'ps' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                       </subModelOperations>
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="middle_&lt;%state.name%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'middle_' + self.state.name"/>
                       </subModelOperations>
                     </subModelOperations>
                   </firstModelOperations>
@@ -704,21 +705,21 @@
                 <sourceViewVariable name="sourceView"/>
                 <targetViewVariable name="targetView"/>
                 <initialOperation>
-                  <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                  <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                       <parameters name="title" value="Read Feature Message Creation"/>
-                      <parameters name="enabled" value="&lt;%false%>"/>
+                      <parameters name="enabled" value="aql:false"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -728,23 +729,23 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:receivingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:sendingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                     </subModelOperations>
                   </firstModelOperations>
                 </initialOperation>
@@ -757,22 +758,22 @@
                 <sourceViewVariable name="sourceView"/>
                 <targetViewVariable name="targetView"/>
                 <initialOperation>
-                  <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                  <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                       <parameters name="title" value="Write Feature Message Creation"/>
-                      <parameters name="enabled" value="&lt;%false%>"/>
+                      <parameters name="enabled" value="aql:false"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -782,23 +783,23 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:receivingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:sendingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                     </subModelOperations>
                   </firstModelOperations>
                 </initialOperation>
@@ -811,21 +812,21 @@
                 <sourceViewVariable name="sourceView"/>
                 <targetViewVariable name="targetView"/>
                 <initialOperation>
-                  <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                  <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                       <parameters name="title" value="Call Message Creation"/>
-                      <parameters name="enabled" value="&lt;%false%>"/>
+                      <parameters name="enabled" value="aql:false"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -835,23 +836,23 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:receivingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:sendingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                     </subModelOperations>
                   </firstModelOperations>
                 </initialOperation>
@@ -864,21 +865,21 @@
                 <sourceViewVariable name="sourceView"/>
                 <targetViewVariable name="targetView"/>
                 <initialOperation>
-                  <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                  <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                       <parameters name="title" value="Read Feature Message Creation"/>
-                      <parameters name="enabled" value="&lt;%false%>"/>
+                      <parameters name="enabled" value="aql:false"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="newMessage">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -888,23 +889,23 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:receivingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:sendingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new return message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                     </subModelOperations>
                   </firstModelOperations>
                 </initialOperation>
@@ -919,19 +920,19 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="finishingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -941,23 +942,23 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:finishingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new execution position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.1/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -973,11 +974,11 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_' + arg0"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + arg0"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -988,12 +989,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -1010,12 +1011,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -1038,12 +1039,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%start != end%>">
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.start &lt;> self.end">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -1059,121 +1060,121 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Event reordering"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Execution&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Execution)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust execution position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="executions"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.ExecutionEnd&quot;)[current.execution.start == current].nLast.execution%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;State&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(State)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust state position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="states"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.StateEnd&quot;)[current.state.start == current].nLast.state%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Message&quot;)%>">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Message)">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sending end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.sendingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.sendingEnd"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.receivingEnd%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.receivingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receiving end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.receivingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.receivingEnd"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust message position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="messages"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.sendingEnd.precedingSibling.filter(&quot;interactions.MessageEnd&quot;)[current.message.receivingEnd == current].nLast.message%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;InteractionUse&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(InteractionUse)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Interaction Use position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="interactionUses"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.InteractionUseEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;CombinedFragment&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(CombinedFragment)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust CombinedFragment position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="combinedFragments"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.CombinedFragmentEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Operand&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Operand)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Operand position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;CombinedFragment&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainer(CombinedFragment)"/>
                     <parameters name="referenceName" value="ownedOperands"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.OperandEnd&quot;)[current.owner.start == current &amp;&amp; current(1).eContainer(&quot;interactions.CombinedFragment&quot;) == current().owner.eContainer(&quot;interactions.CombinedFragment&quot;)].nLast.owner%>"/>
@@ -1198,10 +1199,10 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%finish%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.finish">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -1223,7 +1224,7 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteCombinedFragment()%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteCombinedFragment()"/>
             </initialOperation>
           </ownedTools>
           <subSections name="Operands">
@@ -1240,7 +1241,7 @@
               <elementView name="elementView"/>
               <containerView name="containerView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteOperand()%>"/>
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteOperand()"/>
               </initialOperation>
             </ownedTools>
           </subSections>
@@ -1252,21 +1253,21 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1275,7 +1276,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
@@ -1287,15 +1288,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1304,14 +1305,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1320,15 +1321,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1337,14 +1338,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1354,17 +1355,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1373,14 +1374,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1389,18 +1390,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1409,14 +1410,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1425,17 +1426,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1444,14 +1445,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1463,40 +1464,40 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -1512,7 +1513,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -1536,33 +1537,33 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -1575,7 +1576,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -1596,15 +1597,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -1613,14 +1614,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1629,15 +1630,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -1646,14 +1647,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1663,17 +1664,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -1682,14 +1683,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1698,18 +1699,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -1718,14 +1719,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1734,17 +1735,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -1753,14 +1754,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -1773,27 +1774,27 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.sample.interactions.services.helpers"/>
   </ownedViewpoints>
   <ownedViewpoints endUserDocumentation="Provides diagrams to model interactions between Ecore elements." name="Interactions_Copy1" label="Interactions_Copy1" modelFileExtension="interactions">
-    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="Sequence Diagram on &lt;%name%>" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
+    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="aql'Sequence Diagram on ' + self.name" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
       <filters xsi:type="filter:CompositeFilterDescription" name="CollapseExec" label="Collapse Executions">
         <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']"/>
       </filters>
       <defaultLayer name="Default">
-        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="&lt;%participants%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
+        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="aql:self.participants" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
           <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Lifeline" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant" startingEndFinderExpression="var:self" finishingEndFinderExpression="var:self">
-            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="" resizeKind="NORTH_SOUTH" width="2" height="5" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Interpolated%20blue%20for%20Executions']">
                 <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']"/>
               </style>
             </borderedNodeMappings>
-            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Skyblue']/@entries[name='High_Skyblue']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
-              <conditionnalStyles predicateExpression="&lt;%start == end%>">
+              <conditionnalStyles predicateExpression="aql:self.start = self.end">
                 <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Flabber%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Lavonne']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
               </conditionnalStyles>
             </borderedNodeMappings>
             <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="EOL" preconditionExpression="&lt;%eContainer(&quot;Interaction&quot;).messages.filter(&quot;DestroyParticipantMessage&quot;).receivingEnd[context == current(&quot;Participant&quot;)]%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EndOfLife']" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
-              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
+              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
@@ -1811,8 +1812,9 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelSize="12" labelFormat="bold" showIcon="false" labelExpression="&lt;%name%> : &lt;%type.name%>" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
+          <style xsi:type="style:SquareDescription" labelSize="12" showIcon="false" labelExpression="aql:self.name + ' : ' + self.type.name" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
@@ -1824,56 +1826,56 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%isWrite%>">
-            <style sizeComputationExpression="&lt;%2%>">
+          <conditionnalStyles predicateExpression="aql:self.isWrite">
+            <style sizeComputationExpression="2">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
-          <style lineStyle="dot">
+        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
+          <style lineStyle="dot" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="&lt;%startingEnd%>" finishingEndFinderExpression="&lt;%finishingEnd%>" coveredLifelinesExpression="&lt;%coveredParticipants%>" centerLabelExpression="call(&lt;%interaction.name%>)">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%type%>" labelAlignment="LEFT">
+        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="aql:self.startingEnd" finishingEndFinderExpression="aql:self.finishingEnd" coveredLifelinesExpression="aql:self.coveredParticipants" centerLabelExpression="aql:'call(' + self.interaction.name + ')'">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.type" labelAlignment="LEFT">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -1881,11 +1883,11 @@
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
-        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%finish%>" coveredLifelinesExpression="&lt;%coveredParticipants%>">
-          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="&lt;%ownedOperands%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%getFinishingEnd()%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
+        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants">
+          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="&lt;%operator%>" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
@@ -1907,50 +1909,50 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$sendingEnd.context%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:sendingEnd.context"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -1968,13 +1970,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -2008,37 +2010,37 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2052,13 +2054,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -2083,19 +2085,19 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2105,23 +2107,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -2134,20 +2136,20 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_2:CreateView" mapping="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" containerViewExpression="var:targetView"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2157,23 +2159,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -2188,19 +2190,19 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="finishingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -2210,23 +2212,23 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:finishingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="s&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="'s' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +  self.state.name"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +  self.state.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -2241,15 +2243,15 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -2259,14 +2261,14 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="ps&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'ps' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="middle_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'middle_' + self.state.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -2282,21 +2284,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2306,23 +2308,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -2335,22 +2337,22 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2360,23 +2362,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -2389,21 +2391,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2413,23 +2415,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -2442,21 +2444,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -2466,23 +2468,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new return message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -2497,19 +2499,19 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Execution creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="startingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="finishingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -2519,23 +2521,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:finishingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:startingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new execution position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.1/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -2549,22 +2551,22 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="IU creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUse" referenceName="interactionUses" variableName="newIU">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="ref.&lt;%eContainer.eContents.filter(&quot;InteractionUse&quot;).nSize%>"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="aql:'ref.' + self.eContainer().eContents()->filter(InteractionUse)->size()"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="aql:self.eContainerOrSelf(Interaction)"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="startingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="finishingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
@@ -2575,13 +2577,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust interaction use position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.4/@subModelOperations.2"/>
@@ -2596,10 +2598,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="CF creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragment" referenceName="combinedFragments" variableName="newCF">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operator" valueExpression="alt.&lt;%eContainer.eContents.filter(&quot;CombinedFragment&quot;).nSize%>"/>
@@ -2609,15 +2611,15 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="startCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="finishCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newCF">
@@ -2631,19 +2633,19 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move newOpEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startCF" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -2655,10 +2657,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Operand Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;CombinedFragment&quot;)%>">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand">
@@ -2666,7 +2668,7 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newOperand">
@@ -2676,10 +2678,10 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move operand" id="org.eclipse.sirius.business.api.action.moveElement">
-                  <parameters name="referenceOwner" value="&lt;%$newOperand.eContainer%>"/>
+                  <parameters name="referenceOwner" value="aql:newOperand.eContainer()"/>
                   <parameters name="referenceName" value="ownedOperands"/>
                   <parameters name="element" value="var:newOperand"/>
                   <parameters name="predecessor" value="&lt;%(($newOperand.start.precedingSibling.nReverse.filter(&quot;OperandEnd&quot;) &amp;&amp; $newOperand.eContainer.ownedOperands.start).nFirst).owner%>"/>
@@ -2711,24 +2713,24 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:For" expression="&lt;%$element.~context%>" iteratorName="end">
+                <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.execution%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.message%>">
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%current.sendingEnd == $end &amp;&amp; !current.receivingEnd%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%!current.sendingEnd  &amp;&amp; current.receivingEnd == $end%>">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd =null   and  self.receivingEnd = end">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.state%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
@@ -2745,11 +2747,11 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_' + arg0"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + arg0"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -2760,12 +2762,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -2782,12 +2784,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -2810,12 +2812,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%start != end%>">
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.start &lt;> self.end">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -2831,121 +2833,121 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Event reordering"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Execution&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Execution)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust execution position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="executions"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.ExecutionEnd&quot;)[current.execution.start == current].nLast.execution%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;State&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(State)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust state position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="states"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.StateEnd&quot;)[current.state.start == current].nLast.state%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Message&quot;)%>">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Message)">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sending end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.sendingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.sendingEnd"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.receivingEnd%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.receivingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receiving end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.receivingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.receivingEnd"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust message position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="messages"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.sendingEnd.precedingSibling.filter(&quot;interactions.MessageEnd&quot;)[current.message.receivingEnd == current].nLast.message%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;InteractionUse&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(InteractionUse)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Interaction Use position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="interactionUses"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.InteractionUseEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;CombinedFragment&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(CombinedFragment)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust CombinedFragment position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="combinedFragments"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.CombinedFragmentEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Operand&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Operand)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Operand position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;CombinedFragment&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainer(CombinedFragment)"/>
                     <parameters name="referenceName" value="ownedOperands"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.OperandEnd&quot;)[current.owner.start == current &amp;&amp; current(1).eContainer(&quot;interactions.CombinedFragment&quot;) == current().owner.eContainer(&quot;interactions.CombinedFragment&quot;)].nLast.owner%>"/>
@@ -2970,10 +2972,10 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%finish%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.finish">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -2995,7 +2997,7 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteCombinedFragment()%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteCombinedFragment()"/>
             </initialOperation>
           </ownedTools>
           <subSections name="Operands">
@@ -3012,7 +3014,7 @@
               <elementView name="elementView"/>
               <containerView name="containerView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteOperand()%>"/>
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteOperand()"/>
               </initialOperation>
             </ownedTools>
           </subSections>
@@ -3024,21 +3026,21 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3047,7 +3049,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
@@ -3059,15 +3061,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3076,14 +3078,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3092,15 +3094,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3109,14 +3111,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3126,17 +3128,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3145,14 +3147,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3161,18 +3163,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3181,14 +3183,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3197,17 +3199,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3216,14 +3218,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3235,40 +3237,40 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -3284,7 +3286,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -3308,33 +3310,33 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -3347,7 +3349,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -3368,15 +3370,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -3385,14 +3387,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3401,15 +3403,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -3418,14 +3420,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3435,17 +3437,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -3454,14 +3456,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3470,18 +3472,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -3490,14 +3492,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3506,17 +3508,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -3525,14 +3527,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -3545,27 +3547,27 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.sample.interactions.services.helpers"/>
   </ownedViewpoints>
   <ownedViewpoints endUserDocumentation="Provides diagrams to model interactions between Ecore elements." name="Interactions_Copy2" label="Interactions_Copy2" modelFileExtension="interactions">
-    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="Sequence Diagram on &lt;%name%>" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
+    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" endUserDocumentation="Sequence diagram for Ecore interactions." name="Sequence Diagram on Interaction" label="Sequence Diagram on Interaction" titleExpression="aql'Sequence Diagram on ' + self.name" domainClass="interactions.Interaction" endsOrdering="&lt;%ends &amp;&amp; $eventEnds%>">
       <filters xsi:type="filter:CompositeFilterDescription" name="CollapseExec" label="Collapse Executions">
         <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']"/>
       </filters>
       <defaultLayer name="Default">
-        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="&lt;%participants%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
+        <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Participant']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="aql:self.participants" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
           <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Lifeline" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant" startingEndFinderExpression="var:self" finishingEndFinderExpression="var:self">
-            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="" resizeKind="NORTH_SOUTH" width="2" height="5" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Interpolated%20blue%20for%20Executions']">
                 <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']"/>
               </style>
             </borderedNodeMappings>
-            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="&lt;%self + start + end + currentParticipant%>" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%end%>">
+            <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="&lt;%currentParticipant.getDirectEventsOn(self)%>" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" synchronizationLock="true" domainClass="interactions.State" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end">
               <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Skyblue']/@entries[name='High_Skyblue']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
-              <conditionnalStyles predicateExpression="&lt;%start == end%>">
+              <conditionnalStyles predicateExpression="aql:self.start = self.end">
                 <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Flabber%20Green']" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Lavonne']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/>
               </conditionnalStyles>
             </borderedNodeMappings>
             <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="EOL" preconditionExpression="&lt;%eContainer(&quot;Interaction&quot;).messages.filter(&quot;DestroyParticipantMessage&quot;).receivingEnd[context == current(&quot;Participant&quot;)]%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20EndOfLife']" semanticCandidatesExpression="var:self" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Participant">
-              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
+              <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="5" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
@@ -3583,8 +3585,9 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelSize="12" labelFormat="bold" showIcon="false" labelExpression="&lt;%name%> : &lt;%type.name%>" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
+          <style xsi:type="style:SquareDescription" labelSize="12" showIcon="false" labelExpression="aql:self.name + ' : ' + self.type.name" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
@@ -3596,56 +3599,56 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%isWrite%>">
-            <style sizeComputationExpression="&lt;%2%>">
+          <conditionnalStyles predicateExpression="aql:self.isWrite">
+            <style sizeComputationExpression="2">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>">
-          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="&lt;%2%>">
+        <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd">
+          <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="&lt;%messages%>" semanticElements="&lt;%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="&lt;%getReceivingContext%>" sourceFinderExpression="&lt;%getSendingContext%>" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="&lt;%sendingEnd%>" receivingEndFinderExpression="&lt;%receivingEnd%>" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
-          <style lineStyle="dot">
+        <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetMapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Lost%20Message%20End']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd" invocationMessageFinderExpression="&lt;%self.invocationMessage%>">
+          <style lineStyle="dot" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="&lt;%startingEnd%>" finishingEndFinderExpression="&lt;%finishingEnd%>" coveredLifelinesExpression="&lt;%coveredParticipants%>" centerLabelExpression="call(&lt;%interaction.name%>)">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%type%>" labelAlignment="LEFT">
+        <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + interaction%>" synchronizationLock="true" domainClass="interactions.InteractionUse" startingEndFinderExpression="aql:self.startingEnd" finishingEndFinderExpression="aql:self.finishingEnd" coveredLifelinesExpression="aql:self.coveredParticipants" centerLabelExpression="aql:'call(' + self.interaction.name + ')'">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.type" labelAlignment="LEFT">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -3653,11 +3656,11 @@
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
-        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="&lt;%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%finish%>" coveredLifelinesExpression="&lt;%coveredParticipants%>">
-          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="&lt;%ownedOperands%>" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="&lt;%start%>" finishingEndFinderExpression="&lt;%getFinishingEnd()%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
+        <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants">
+          <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[&lt;%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="&lt;%operator%>" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']">
             <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/>
           </style>
         </containerMappings>
@@ -3679,50 +3682,50 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$sendingEnd.context%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:sendingEnd.context"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3740,13 +3743,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -3780,37 +3783,37 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3824,13 +3827,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -3855,19 +3858,19 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3877,23 +3880,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3906,20 +3909,20 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_2:CreateView" mapping="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" containerViewExpression="var:targetView"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -3929,23 +3932,23 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%$newMessage.sendingEnd%>"/>
+                  <parameters name="predecessor" value="aql:newMessage.sendingEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -3960,19 +3963,19 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="finishingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -3982,23 +3985,23 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:finishingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="s&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="'s' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +  self.state.name"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +  self.state.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -4013,15 +4016,15 @@
                 <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Execution creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newState.owner%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -4031,14 +4034,14 @@
                       <parameters name="referenceOwner" value="var:self"/>
                       <parameters name="referenceName" value="ends"/>
                       <parameters name="element" value="var:startingEnd"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState">
                       <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/>
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="ps&lt;%eContainer(&quot;Interaction&quot;).states.nSize%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'ps' + self.eContainerOrSelf(interactions::Interaction).states->size()"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="middle_&lt;%state.name%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'middle_' + self.state.name"/>
                     </subModelOperations>
                   </subModelOperations>
                 </firstModelOperations>
@@ -4054,21 +4057,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4078,23 +4081,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4107,22 +4110,22 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4132,23 +4135,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4161,21 +4164,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$target.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:target.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4185,23 +4188,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4214,21 +4217,21 @@
               <sourceViewVariable name="sourceView"/>
               <targetViewVariable name="targetView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$target.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:target.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$source.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:source.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$target.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:target.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4238,23 +4241,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new return message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4269,19 +4272,19 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Execution creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;interactions.Interaction&quot;)%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="startingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="finishingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$newExecution.owner%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/>
@@ -4291,23 +4294,23 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:finishingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:startingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new execution position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.1/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                   </subModelOperations>
                 </subModelOperations>
               </firstModelOperations>
@@ -4321,22 +4324,22 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="IU creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUse" referenceName="interactionUses" variableName="newIU">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="ref.&lt;%eContainer.eContents.filter(&quot;InteractionUse&quot;).nSize%>"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="aql:'ref.' + self.eContainer().eContents()->filter(InteractionUse)->size()"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="aql:self.eContainerOrSelf(Interaction)"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="startingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="finishingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$instance.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + instance.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
@@ -4347,13 +4350,13 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust interaction use position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.4/@subModelOperations.2"/>
@@ -4368,10 +4371,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="CF creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragment" referenceName="combinedFragments" variableName="newCF">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operator" valueExpression="alt.&lt;%eContainer.eContents.filter(&quot;CombinedFragment&quot;).nSize%>"/>
@@ -4381,15 +4384,15 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="startCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="finishCF">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%$newCF.operator%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +newCF.operator"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newCF">
@@ -4403,19 +4406,19 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:finishCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessor){%>&lt;%$finishingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move newOpEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startCF" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startCF"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -4427,10 +4430,10 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Operand Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;CombinedFragment&quot;)%>">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand">
@@ -4438,7 +4441,7 @@
                   </subModelOperations>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%$newOperand.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newOperand">
@@ -4448,10 +4451,10 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:newOpEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($startingEndPredecessor){%>&lt;%$startingEndPredecessor.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move operand" id="org.eclipse.sirius.business.api.action.moveElement">
-                  <parameters name="referenceOwner" value="&lt;%$newOperand.eContainer%>"/>
+                  <parameters name="referenceOwner" value="aql:newOperand.eContainer()"/>
                   <parameters name="referenceName" value="ownedOperands"/>
                   <parameters name="element" value="var:newOperand"/>
                   <parameters name="predecessor" value="&lt;%(($newOperand.start.precedingSibling.nReverse.filter(&quot;OperandEnd&quot;) &amp;&amp; $newOperand.eContainer.ownedOperands.start).nFirst).owner%>"/>
@@ -4483,24 +4486,24 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:For" expression="&lt;%$element.~context%>" iteratorName="end">
+                <subModelOperations xsi:type="tool_1:For" expression="aql:element.eInverse('context')" iteratorName="end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;ExecutionEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.execution%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.execution">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;MessageEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.message%>">
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%current.sendingEnd == $end &amp;&amp; !current.receivingEnd%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.message">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd = end  and   self.receivingEnd = null">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
-                      <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%!current.sendingEnd  &amp;&amp; current.receivingEnd == $end%>">
+                      <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd =null   and  self.receivingEnd = end">
                         <subModelOperations xsi:type="tool_1:RemoveElement"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;$end.filter(&quot;StateEnd&quot;)%>">
-                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$end.state%>">
+                    <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:end.state">
                       <subModelOperations xsi:type="tool_1:RemoveElement"/>
                     </subModelOperations>
                   </subModelOperations>
@@ -4517,11 +4520,11 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_' + arg0"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%$0%>"/>
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + arg0"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -4532,12 +4535,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%receivingEnd%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.execution == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -4554,12 +4557,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%filter(&quot;MixEnd&quot;).nSize == 0 ||filter(&quot;MixEnd&quot;).nSize != 0 &amp;&amp; current.message == null%>">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
@@ -4582,12 +4585,12 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%start != end%>">
-                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.start &lt;> self.end">
+                  <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                     <subModelOperations xsi:type="tool_1:RemoveElement"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%end%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -4603,121 +4606,121 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Event reordering"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Execution&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Execution)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust execution position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="executions"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.ExecutionEnd&quot;)[current.execution.start == current].nLast.execution%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;State&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(State)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.end%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.end"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust state position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="states"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.StateEnd&quot;)[current.state.start == current].nLast.state%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Message&quot;)%>">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.sendingEnd%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Message)">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.sendingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sending end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.sendingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.sendingEnd"/>
+                      <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.receivingEnd%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.receivingEnd">
                     <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receiving end" id="org.eclipse.sirius.business.api.action.moveElement">
-                      <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                      <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                       <parameters name="referenceName" value="ends"/>
-                      <parameters name="element" value="&lt;%self.receivingEnd%>"/>
-                      <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                      <parameters name="element" value="aql:self.receivingEnd"/>
+                      <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                     </subModelOperations>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust message position 2" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="messages"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.sendingEnd.precedingSibling.filter(&quot;interactions.MessageEnd&quot;)[current.message.receivingEnd == current].nLast.message%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;InteractionUse&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(InteractionUse)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Interaction Use position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="interactionUses"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.InteractionUseEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;CombinedFragment&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(CombinedFragment)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.finish%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($finishingEndPredecessorAfter){%>&lt;%$finishingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.finish"/>
+                    <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust CombinedFragment position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="combinedFragments"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.CombinedFragmentEnd&quot;)[current.owner.start == current].nLast.owner%>"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%self.filter(&quot;Operand&quot;)%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Operand)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;Interaction&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/>
                     <parameters name="referenceName" value="ends"/>
-                    <parameters name="element" value="&lt;%self.start%>"/>
-                    <parameters name="predecessor" value="&lt;%if ($startingEndPredecessorAfter){%>&lt;%$startingEndPredecessorAfter.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="element" value="aql:self.start"/>
+                    <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Operand position" id="org.eclipse.sirius.business.api.action.moveElement">
-                    <parameters name="referenceOwner" value="&lt;%eContainer(&quot;CombinedFragment&quot;)%>"/>
+                    <parameters name="referenceOwner" value="aql:self.eContainer(CombinedFragment)"/>
                     <parameters name="referenceName" value="ownedOperands"/>
                     <parameters name="element" value="var:self"/>
                     <parameters name="predecessor" value="&lt;%self.start.precedingSibling.filter(&quot;interactions.OperandEnd&quot;)[current.owner.start == current &amp;&amp; current(1).eContainer(&quot;interactions.CombinedFragment&quot;) == current().owner.eContainer(&quot;interactions.CombinedFragment&quot;)].nLast.owner%>"/>
@@ -4742,10 +4745,10 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%start%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%finish%>">
+                <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.finish">
                   <subModelOperations xsi:type="tool_1:RemoveElement"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:RemoveElement"/>
@@ -4767,7 +4770,7 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteCombinedFragment()%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteCombinedFragment()"/>
             </initialOperation>
           </ownedTools>
           <subSections name="Operands">
@@ -4784,7 +4787,7 @@
               <elementView name="elementView"/>
               <containerView name="containerView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.deleteOperand()%>"/>
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteOperand()"/>
               </initialOperation>
             </ownedTools>
           </subSections>
@@ -4796,21 +4799,21 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4819,7 +4822,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
@@ -4831,15 +4834,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4848,14 +4851,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -4864,15 +4867,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4881,14 +4884,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:sendingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -4898,17 +4901,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4917,14 +4920,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4933,18 +4936,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4953,14 +4956,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -4969,17 +4972,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/>
@@ -4988,14 +4991,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:sendingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -5007,40 +5010,40 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -5056,7 +5059,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -5080,33 +5083,33 @@
             <element name="container"/>
             <elementView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Call Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$container.currentParticipant.type.eOperations.nFirst%>"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="aql:container.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e&lt;%eContainer(&quot;Interaction&quot;).executions.nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$container.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:container.currentParticipant()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_&lt;%execution.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:startExec"/>
@@ -5119,7 +5122,7 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:startExec"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement">
                   <parameters name="referenceOwner" value="var:self"/>
@@ -5140,15 +5143,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Creation Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -5157,14 +5160,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -5173,15 +5176,15 @@
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                   <parameters name="title" value="Destruction Message Creation"/>
-                  <parameters name="enabled" value="&lt;%false%>"/>
+                  <parameters name="enabled" value="aql:false"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/>
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -5190,14 +5193,14 @@
                   <parameters name="referenceOwner" value="var:self"/>
                   <parameters name="referenceName" value="ends"/>
                   <parameters name="element" value="var:receivingEnd"/>
-                  <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                  <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                   <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -5207,17 +5210,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Read Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -5226,14 +5229,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -5242,18 +5245,18 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Write Feature Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="&lt;%$element.currentParticipant.type.eStructuralFeatures.nFirst%>"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="&lt;%true%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="feature" valueExpression="aql:element.currentParticipant().type.eStructuralFeatures->first()"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -5262,14 +5265,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -5278,17 +5281,17 @@
               <element name="element"/>
               <elementView name="elementView"/>
               <initialOperation>
-                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$element.eContainer(&quot;Interaction&quot;)%>">
+                <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainerOrSelf(interactions::Interaction)">
                   <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables">
                     <parameters name="title" value="Call Message Creation"/>
-                    <parameters name="enabled" value="&lt;%false%>"/>
+                    <parameters name="enabled" value="aql:false"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="&lt;%$element.currentParticipant.type.eOperations.nFirst%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="operation" valueExpression="aql:element.currentParticipant().type.eOperations->first()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="&lt;%$element.currentParticipant%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:element.currentParticipant()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="receivingEnd" valueExpression="var:receivingEnd"/>
@@ -5297,14 +5300,14 @@
                     <parameters name="referenceOwner" value="var:self"/>
                     <parameters name="referenceName" value="ends"/>
                     <parameters name="element" value="var:receivingEnd"/>
-                    <parameters name="predecessor" value="&lt;%if ($endBefore){%>&lt;%$endBefore.semanticEnd%>&lt;%}%>"/>
+                    <parameters name="predecessor" value="aql:endBefore.semanticEnd"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage">
                     <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m&lt;%eContainer(&quot;Interaction&quot;).messages.nSize %>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd">
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_&lt;%message.name%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/>
                   </subModelOperations>
                 </firstModelOperations>
               </initialOperation>
@@ -5329,7 +5332,7 @@
     <entries xsi:type="description:UserFixedColor" red="126" green="206" blue="202" name="Seabluff"/>
     <entries xsi:type="description:UserFixedColor" red="160" green="222" blue="214" name="Paleolitico"/>
     <entries xsi:type="description:UserFixedColor" red="199" green="237" blue="232" name="Glint on the ocean"/>
-    <entries xsi:type="description:InterpolatedColor" name="Interpolated blue for Executions" colorValueComputationExpression="&lt;%computeExecutionDepth()%>">
+    <entries xsi:type="description:InterpolatedColor" name="Interpolated blue for Executions" colorValueComputationExpression="aql:self.computeExecutionDepth()">
       <colorSteps associatedValue="0" associatedColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Glint%20on%20the%20ocean']"/>
       <colorSteps associatedValue="10" associatedColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']"/>
     </entries>
@@ -5339,7 +5342,7 @@
     <entries xsi:type="description:UserFixedColor" red="166" green="227" blue="187" name="Watery Green"/>
     <entries xsi:type="description:UserFixedColor" red="186" green="250" blue="158" name="Gentler Spring"/>
     <entries xsi:type="description:UserFixedColor" red="16" green="120" blue="103" name="Flabber Green"/>
-    <entries xsi:type="description:InterpolatedColor" name="Interpolated green for Combined Fragments" colorValueComputationExpression="&lt;%computeCombinedFragmentDepth()%>">
+    <entries xsi:type="description:InterpolatedColor" name="Interpolated green for Combined Fragments" colorValueComputationExpression="aql:self.computeCombinedFragmentDepth()">
       <colorSteps associatedValue="0" associatedColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']"/>
       <colorSteps associatedValue="5" associatedColor="//@userColorsPalettes[name='Greens']/@entries[name='Flabber%20Green']"/>
     </entries>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-2649/VP-2649.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-2649/VP-2649.odesign
index 106dbd26a9..b70764e809 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-2649/VP-2649.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-2649/VP-2649.odesign
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_3="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-2649" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_3="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-2649" version="10.0.0.201505222000">
   <ownedViewpoints endUserDocumentation="&lt;html>&#xA;&lt;head>&#xA;&lt;/head>&#xA;&lt;body>&#xA;&lt;p>Provides graphical and tabular representation to design an Ecore model.&lt;/p>&#xA;&lt;br>&#xA;&lt;img src=&quot;/doc/screenshots/entities.png&quot;/>&#xA;&lt;img src=&quot;/doc/screenshots/classes.png&quot;/>&#xA;&lt;/body>&#xA;&lt;/html>&#xA;&#xA;&#xA;" name="VP-2649_Viewpoint" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="VP-2649_Diagram" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <containerMappings name="EClassMapping" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="EClassMapping" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EPackageMapping" deletionDescription="//@ownedViewpoints[name='VP-2649_Viewpoint']/@ownedRepresentations[name='VP-2649_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteEPackageTool']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='VP-2649_Viewpoint']/@ownedRepresentations[name='VP-2649_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping'] //@ownedViewpoints[name='VP-2649_Viewpoint']/@ownedRepresentations[name='VP-2649_Diagram']/@defaultLayer/@containerMappings[name='EClassMapping']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="EPackageMapping" deletionDescription="//@ownedViewpoints[name='VP-2649_Viewpoint']/@ownedRepresentations[name='VP-2649_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteEPackageTool']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='VP-2649_Viewpoint']/@ownedRepresentations[name='VP-2649_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping'] //@ownedViewpoints[name='VP-2649_Viewpoint']/@ownedRepresentations[name='VP-2649_Diagram']/@defaultLayer/@containerMappings[name='EClassMapping']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -32,19 +32,20 @@
       </defaultLayer>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="VP-2649_Table" domainClass="EPackage">
-      <ownedLineMappings name="EClassLineMapping" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
-        <foregroundConditionalStyle predicateExpression="&lt;%abstract%>">
-          <style labelSize="10" labelFormat="italic">
+      <ownedLineMappings name="EClassLineMapping" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
+        <foregroundConditionalStyle predicateExpression="aql:self.abstract">
+          <style labelSize="10">
+            <labelFormat>italic</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </foregroundConditionalStyle>
         <ownedSubLines name="Feature" domainClass="EStructuralFeature"/>
       </ownedLineMappings>
-      <ownedLineMappings name="EPackageLineMapping" domainClass="EPackage" headerLabelExpression="&lt;%name%>">
+      <ownedLineMappings name="EPackageLineMapping" domainClass="EPackage" headerLabelExpression="aql:self.name">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
         </defaultBackground>
-        <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
+        <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
           <ownedSubLines name="Feature" domainClass="EStructuralFeature"/>
         </ownedSubLines>
         <delete name="EPackageLineDeleteTool">
@@ -56,7 +57,7 @@
       <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="&lt;%if (filter(&quot;EStructuralFeature&quot;).derived) {%>/&lt;%}%>&lt;%name%>"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_3:TreeDescription" name="VP-2649_Tree" domainClass="EPackage">
-      <subItemMappings name="EClassTreeItemMapping" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
+      <subItemMappings name="EClassTreeItemMapping" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
         <defaultStyle>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-3535/VP-3535.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-3535/VP-3535.odesign
index b951cb1476..439d567aaf 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-3535/VP-3535.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-3535/VP-3535.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="VP-3535" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="VP-3535" version="10.0.0.201505222000">
   <ownedViewpoints name="VP-3535_Viewpoint" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3535_Diagram" domainClass="ecore.EPackage">
       <defaultLayer name="Default">
@@ -10,64 +10,80 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'square'/]">
-            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
+            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'lozenge'/]">
-            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
+            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'ellipse'/]">
-            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
+            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'bundledImage'/]">
-            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
+            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'note'/]">
-            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
+            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'dot'/]">
-            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
+            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'gauge'/]">
-            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
+            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-              <sections maxValueExpression="&lt;%90%>" valueExpression="&lt;%50%>" label="FirstSection">
+              <sections maxValueExpression="90" valueExpression="50" label="FirstSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               </sections>
-              <sections maxValueExpression="&lt;%30%>" valueExpression="&lt;%15%>" label="SecondSection">
+              <sections maxValueExpression="30" valueExpression="15" label="SecondSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
               </sections>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImage'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
@@ -79,64 +95,80 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'square'/]">
-            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
+            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'lozenge'/]">
-            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
+            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'ellipse'/]">
-            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
+            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'bundledImage'/]">
-            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
+            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'note'/]">
-            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
+            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'dot'/]">
-            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
+            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'gauge'/]">
-            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
+            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-              <sections maxValueExpression="&lt;%90%>" valueExpression="&lt;%50%>" label="FirstSection">
+              <sections maxValueExpression="90" valueExpression="50" label="FirstSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               </sections>
-              <sections maxValueExpression="&lt;%30%>" valueExpression="&lt;%15%>" label="SecondSection">
+              <sections maxValueExpression="30" valueExpression="15" label="SecondSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
               </sections>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImage'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
@@ -148,64 +180,80 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'square'/]">
-            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
+            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'lozenge'/]">
-            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
+            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'ellipse'/]">
-            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
+            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'bundledImage'/]">
-            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
+            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'note'/]">
-            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
+            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'dot'/]">
-            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
+            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'gauge'/]">
-            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
+            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-              <sections maxValueExpression="&lt;%90%>" valueExpression="&lt;%50%>" label="FirstSection">
+              <sections maxValueExpression="90" valueExpression="50" label="FirstSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               </sections>
-              <sections maxValueExpression="&lt;%30%>" valueExpression="&lt;%15%>" label="SecondSection">
+              <sections maxValueExpression="30" valueExpression="15" label="SecondSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
               </sections>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImage'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
@@ -217,64 +265,80 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'square'/]">
-            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
+            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'lozenge'/]">
-            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
+            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'ellipse'/]">
-            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
+            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'bundledImage'/]">
-            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
+            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'note'/]">
-            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
+            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'dot'/]">
-            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
+            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'gauge'/]">
-            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
+            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-              <sections maxValueExpression="&lt;%90%>" valueExpression="&lt;%50%>" label="FirstSection">
+              <sections maxValueExpression="90" valueExpression="50" label="FirstSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               </sections>
-              <sections maxValueExpression="&lt;%30%>" valueExpression="&lt;%15%>" label="SecondSection">
+              <sections maxValueExpression="30" valueExpression="15" label="SecondSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
               </sections>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImage'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
@@ -286,64 +350,80 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'square'/]">
-            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
+            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'lozenge'/]">
-            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
+            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'ellipse'/]">
-            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
+            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'bundledImage'/]">
-            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
+            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'note'/]">
-            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
+            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'dot'/]">
-            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
+            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'gauge'/]">
-            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
+            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-              <sections maxValueExpression="&lt;%90%>" valueExpression="&lt;%50%>" label="FirstSection">
+              <sections maxValueExpression="90" valueExpression="50" label="FirstSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               </sections>
-              <sections maxValueExpression="&lt;%30%>" valueExpression="&lt;%15%>" label="SecondSection">
+              <sections maxValueExpression="30" valueExpression="15" label="SecondSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
               </sections>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImage'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
@@ -355,64 +435,80 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'square'/]">
-            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
+            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'lozenge'/]">
-            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
+            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'ellipse'/]">
-            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
+            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'bundledImage'/]">
-            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
+            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'note'/]">
-            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
+            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'dot'/]">
-            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
+            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'gauge'/]">
-            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
+            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-              <sections maxValueExpression="&lt;%90%>" valueExpression="&lt;%50%>" label="FirstSection">
+              <sections maxValueExpression="90" valueExpression="50" label="FirstSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               </sections>
-              <sections maxValueExpression="&lt;%30%>" valueExpression="&lt;%15%>" label="SecondSection">
+              <sections maxValueExpression="30" valueExpression="15" label="SecondSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
               </sections>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImage'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
@@ -421,142 +517,174 @@
           <style xsi:type="style:GaugeCompositeStyleDescription" labelExpression="[name+'WithGaugeStyle'/]" iconPath="/DesignerTestProject/image.bmp" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <sections maxValueExpression="&lt;%90%>" valueExpression="&lt;%50%>" label="FirstSection">
+            <sections maxValueExpression="90" valueExpression="50" label="FirstSection">
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </sections>
-            <sections maxValueExpression="&lt;%30%>" valueExpression="&lt;%15%>" label="SecondSection">
+            <sections maxValueExpression="30" valueExpression="15" label="SecondSection">
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </sections>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'square'/]">
-            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
+            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'lozenge'/]">
-            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
+            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'ellipse'/]">
-            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
+            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'bundledImage'/]">
-            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
+            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'note'/]">
-            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
+            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'dot'/]">
-            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
+            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'gauge'/]">
-            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
+            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-              <sections maxValueExpression="&lt;%90%>" valueExpression="&lt;%50%>" label="FirstSection">
+              <sections maxValueExpression="90" valueExpression="50" label="FirstSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               </sections>
-              <sections maxValueExpression="&lt;%30%>" valueExpression="&lt;%15%>" label="SecondSection">
+              <sections maxValueExpression="30" valueExpression="15" label="SecondSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
               </sections>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImage'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
         </nodeMappings>
         <nodeMappings name="EClassNodeWithWorkspaceImageStyle" semanticCandidatesExpression="[eClassifiers/]" domainClass="ecore.EClass">
-          <style xsi:type="style:WorkspaceImageDescription" labelExpression="[name+'WithWorkspaceImageStyle'/]" iconPath="/DesignerTestProject/image.bmp" sizeComputationExpression="-1" resizeKind="NSEW" workspacePath="/DesignerTestProject/image.bmp">
+          <style xsi:type="style:WorkspaceImageDescription" labelExpression="[name+'WithWorkspaceImageStyle'/]" iconPath="/DesignerTestProject/image.bmp" sizeComputationExpression="-1" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/DesignerTestProject/image.bmp">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'square'/]">
-            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
+            <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithSquareStyle'/]" labelAlignment="LEFT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" width="5" height="6">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'lozenge'/]">
-            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
+            <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="4" labelSize="6" showIcon="false" labelExpression="[name+'WithLozengeStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" labelPosition="node" widthComputationExpression="10" heightComputationExpression="5">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'ellipse'/]">
-            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
+            <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="2" labelSize="10" showIcon="false" labelExpression="[name+'WithEllipseStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" horizontalDiameterComputationExpression="2" verticalDiameterComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'bundledImage'/]">
-            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
+            <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="1" labelSize="5" showIcon="false" labelExpression="[name+'WithBundledImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="test" sizeComputationExpression="5" labelPosition="node" shape="triangle">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'note'/]">
-            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
+            <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" labelSize="9" showIcon="false" labelExpression="[name+'WithNoteStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="8" labelPosition="node">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'dot'/]">
-            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
+            <style xsi:type="style:DotDescription" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithDotStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" strokeSizeComputationExpression="3">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'gauge'/]">
-            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
+            <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="1" labelSize="7" showIcon="false" labelExpression="[name+'WithGaugeStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="2" labelPosition="node" alignment="HORIZONTAL">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
-              <sections maxValueExpression="&lt;%90%>" valueExpression="&lt;%50%>" label="FirstSection">
+              <sections maxValueExpression="90" valueExpression="50" label="FirstSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               </sections>
-              <sections maxValueExpression="&lt;%30%>" valueExpression="&lt;%15%>" label="SecondSection">
+              <sections maxValueExpression="30" valueExpression="15" label="SecondSection">
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
                 <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
               </sections>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImage'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="5" showIcon="false" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="LEFT" tooltipExpression="Test" sizeComputationExpression="4" labelPosition="node" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
@@ -564,15 +692,17 @@
       </defaultLayer>
       <additionalLayers name="layerOfContainerStyles">
         <containerMappings name="EPackageWithFlatContainerStyle" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="[name+'WithFlatContainerStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT" backgroundStyle="Liquid">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="[name+'WithFlatContainerStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT" backgroundStyle="Liquid">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'flat'/]">
-            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="2" arcHeight="2" borderSizeComputationExpression="2" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithFlatContainerStyleTest'/]" roundedCorner="true">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="2" arcHeight="2" borderSizeComputationExpression="2" labelSize="7" showIcon="false" labelExpression="[name+'WithFlatContainerStyleTest'/]" roundedCorner="true">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -580,28 +710,34 @@
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'shape'/]">
-            <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="3" arcHeight="3" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithShapeContainerStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="Test" roundedCorner="true">
+            <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="3" arcHeight="3" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithShapeContainerStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="Test" roundedCorner="true">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImageContainer'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="RIGHT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="10" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="RIGHT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
         </containerMappings>
         <containerMappings name="EPackageWithShapeContainerStyle" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage">
-          <style xsi:type="style:ShapeContainerStyleDescription" labelExpression="[name+'WithShapeContainerStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT">
+          <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="[name+'WithShapeContainerStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'flat'/]">
-            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="2" arcHeight="2" borderSizeComputationExpression="2" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithFlatContainerStyleTest'/]" roundedCorner="true">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="2" arcHeight="2" borderSizeComputationExpression="2" labelSize="7" showIcon="false" labelExpression="[name+'WithFlatContainerStyleTest'/]" roundedCorner="true">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -609,27 +745,33 @@
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'shape'/]">
-            <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="3" arcHeight="3" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithShapeContainerStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="Test" roundedCorner="true">
+            <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="3" arcHeight="3" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithShapeContainerStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="Test" roundedCorner="true">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImageContainer'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="RIGHT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="10" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="RIGHT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
         </containerMappings>
         <containerMappings name="EPackageWithWorkspaceImageDescription" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage">
-          <style xsi:type="style:WorkspaceImageDescription" labelExpression="[name+'WithWorkspaceImageStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT" labelPosition="node" workspacePath="/DesignerTestProject/image.bmp">
+          <style xsi:type="style:WorkspaceImageDescription" labelExpression="[name+'WithWorkspaceImageStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT" labelPosition="node" arcWidth="1" arcHeight="1" workspacePath="/DesignerTestProject/image.bmp">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'flat'/]">
-            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="2" arcHeight="2" borderSizeComputationExpression="2" labelSize="7" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithFlatContainerStyleTest'/]" roundedCorner="true">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="2" arcHeight="2" borderSizeComputationExpression="2" labelSize="7" showIcon="false" labelExpression="[name+'WithFlatContainerStyleTest'/]" roundedCorner="true">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -637,15 +779,19 @@
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'shape'/]">
-            <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="3" arcHeight="3" borderSizeComputationExpression="2" labelSize="6" labelFormat="bold_italic" showIcon="false" labelExpression="[name+'WithShapeContainerStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="Test" roundedCorner="true">
+            <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="3" arcHeight="3" borderSizeComputationExpression="2" labelSize="6" showIcon="false" labelExpression="[name+'WithShapeContainerStyleTest'/]" labelAlignment="RIGHT" tooltipExpression="Test" roundedCorner="true">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'workspaceImageContainer'/]">
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="10" labelFormat="bold_italic" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="RIGHT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="10" labelExpression="[name+'WithWorkspaceImageStyleTest'/]" labelAlignment="RIGHT" sizeComputationExpression="4" labelPosition="node" resizeKind="NSEW" arcWidth="2" arcHeight="2" roundedCorner="true" workspacePath="/DesignerTestProject/image.jpg">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+              <labelFormat>italic</labelFormat>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </conditionnalStyles>
@@ -653,7 +799,7 @@
       </additionalLayers>
       <additionalLayers name="layerWithEdgeStyles">
         <edgeMappings name="ESuperType" sourceMapping="//@ownedViewpoints[name='VP-3535_Viewpoint']/@ownedRepresentations[name='VP-3535_Diagram']/@defaultLayer/@nodeMappings[name='EClassNodeWithSquareStyle']" targetMapping="//@ownedViewpoints[name='VP-3535_Viewpoint']/@ownedRepresentations[name='VP-3535_Diagram']/@defaultLayer/@nodeMappings[name='EClassNodeWithSquareStyle']" targetFinderExpression="[eSuperTypes/]">
-          <style xsi:type="style:BracketEdgeStyleDescription">
+          <style xsi:type="style:BracketEdgeStyleDescription" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <beginLabelStyleDescription labelExpression="['beginSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -668,13 +814,19 @@
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'bracket'/]">
             <style xsi:type="style:BracketEdgeStyleDescription" lineStyle="dash" sourceArrow="InputArrow" targetArrow="InputClosedArrow" sizeComputationExpression="&lt;%eContents().nSize + 1%>">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
-              <beginLabelStyleDescription labelSize="6" labelFormat="bold_italic" labelExpression="['beginSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+              <beginLabelStyleDescription labelSize="6" labelExpression="['beginSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
               </beginLabelStyleDescription>
-              <centerLabelStyleDescription labelSize="7" labelFormat="bold_italic" labelExpression="['centerSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+              <centerLabelStyleDescription labelSize="7" labelExpression="['centerSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
               </centerLabelStyleDescription>
-              <endLabelStyleDescription labelSize="9" labelFormat="bold_italic" labelExpression="['endSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+              <endLabelStyleDescription labelSize="9" labelExpression="['endSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               </endLabelStyleDescription>
             </style>
@@ -682,13 +834,19 @@
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'edgeStyle'/]">
             <style lineStyle="dot" sourceArrow="Diamond" targetArrow="InputArrowWithDiamond" sizeComputationExpression="4" routingStyle="tree">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
-              <beginLabelStyleDescription labelSize="4" labelFormat="bold_italic" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+              <beginLabelStyleDescription labelSize="4" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
               </beginLabelStyleDescription>
-              <centerLabelStyleDescription labelSize="9" labelFormat="bold_italic" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+              <centerLabelStyleDescription labelSize="9" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
               </centerLabelStyleDescription>
-              <endLabelStyleDescription labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+              <endLabelStyleDescription labelSize="5" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
               </endLabelStyleDescription>
             </style>
@@ -710,13 +868,19 @@
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'bracket'/]">
             <style xsi:type="style:BracketEdgeStyleDescription" lineStyle="dash" sourceArrow="InputArrow" targetArrow="InputClosedArrow" sizeComputationExpression="&lt;%eContents().nSize + 1%>">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
-              <beginLabelStyleDescription labelSize="6" labelFormat="bold_italic" labelExpression="['beginSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+              <beginLabelStyleDescription labelSize="6" labelExpression="['beginSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
               </beginLabelStyleDescription>
-              <centerLabelStyleDescription labelSize="7" labelFormat="bold_italic" labelExpression="['centerSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+              <centerLabelStyleDescription labelSize="7" labelExpression="['centerSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
               </centerLabelStyleDescription>
-              <endLabelStyleDescription labelSize="9" labelFormat="bold_italic" labelExpression="['endSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+              <endLabelStyleDescription labelSize="9" labelExpression="['endSuperType'+name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               </endLabelStyleDescription>
             </style>
@@ -724,13 +888,19 @@
           <conditionnalStyles predicateExpression="[container.oclAsType(EPackage).nsURI = 'edgeStyle'/]">
             <style lineStyle="dot" sourceArrow="Diamond" targetArrow="InputArrowWithDiamond" sizeComputationExpression="4" routingStyle="tree">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_yellow']"/>
-              <beginLabelStyleDescription labelSize="4" labelFormat="bold_italic" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+              <beginLabelStyleDescription labelSize="4" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
               </beginLabelStyleDescription>
-              <centerLabelStyleDescription labelSize="9" labelFormat="bold_italic" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+              <centerLabelStyleDescription labelSize="9" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/>
               </centerLabelStyleDescription>
-              <endLabelStyleDescription labelSize="5" labelFormat="bold_italic" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+              <endLabelStyleDescription labelSize="5" showIcon="false" labelExpression="[name/]" iconPath="/DesignerTestProject/image.bmp">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
               </endLabelStyleDescription>
             </style>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP978/VP978-2.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP978/VP978-2.odesign
index ca7e60d747..49b7d6dc1f 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP978/VP978-2.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP978/VP978-2.odesign
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="EdgeLabelRefreshPb" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="EdgeLabelRefreshPb" version="10.0.0.201505222000">
   <ownedViewpoints name="EdgeLabelRefreshPb" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="EdgeLabelRefreshPb" domainClass="EPackage">
       <defaultLayer name="Default">
-        <nodeMappings name="EClassWithLabelInside" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + eReferences%>" domainClass="EClass">
+        <nodeMappings name="EClassWithLabelInside" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eReferences" domainClass="EClass">
           <style xsi:type="style:SquareDescription" labelExpression="defaultStyle&lt;%eReferences.nFirst.name%>" labelPosition="node" width="10" height="3">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -17,7 +17,7 @@
             </style>
           </conditionnalStyles>
         </nodeMappings>
-        <nodeMappings name="EClassWithLabelOutside" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + eReferences%>" domainClass="EClass">
+        <nodeMappings name="EClassWithLabelOutside" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eReferences" domainClass="EClass">
           <style xsi:type="style:SquareDescription" labelExpression="defaultStyle&lt;%eReferences.nFirst.name%>">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -31,7 +31,7 @@
             </style>
           </conditionnalStyles>
         </nodeMappings>
-        <edgeMappings name="SimpleEdge" semanticElements="&lt;%self + eReferences%>" sourceMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='EClassWithLabelInside']" targetMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='EClassWithLabelOutside']" targetFinderExpression="var:self">
+        <edgeMappings name="SimpleEdge" semanticElements="aql:Sequence{self} + self.eReferences" sourceMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='EClassWithLabelInside']" targetMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='EClassWithLabelOutside']" targetFinderExpression="var:self">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription labelExpression="&lt;%eReferences.nFirst.name%>">
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP978/VP978.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP978/VP978.odesign
index 94f5c08b3c..9b18b34309 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP978/VP978.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP978/VP978.odesign
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="EdgeLabelRefreshPb" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="EdgeLabelRefreshPb" version="10.0.0.201505222000">
   <ownedViewpoints name="EdgeLabelRefreshPb" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="EdgeLabelRefreshPb" domainClass="EPackage">
       <defaultLayer name="Default">
-        <nodeMappings name="EClassWithLabelInside" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + eReferences%>" domainClass="EClass">
+        <nodeMappings name="EClassWithLabelInside" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eReferences" domainClass="EClass">
           <style xsi:type="style:SquareDescription" labelExpression="defaultStyle&lt;%eReferences.nFirst.name%>" labelPosition="node" width="10" height="3">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -24,7 +24,7 @@
             </style>
           </conditionnalStyles>
         </nodeMappings>
-        <nodeMappings name="EClassWithLabelOutside" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + eReferences%>" domainClass="EClass">
+        <nodeMappings name="EClassWithLabelOutside" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eReferences" domainClass="EClass">
           <style xsi:type="style:SquareDescription" labelExpression="defaultStyle&lt;%eReferences.nFirst.name%>">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -45,7 +45,7 @@
             </style>
           </conditionnalStyles>
         </nodeMappings>
-        <edgeMappings name="edge" semanticElements="&lt;%self + eReferences%>" sourceMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='EClassWithLabelInside']" targetMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='EClassWithLabelOutside']" targetFinderExpression="var:self">
+        <edgeMappings name="edge" semanticElements="aql:Sequence{self} + self.eReferences" sourceMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='EClassWithLabelInside']" targetMapping="//@ownedViewpoints[name='EdgeLabelRefreshPb']/@ownedRepresentations[name='EdgeLabelRefreshPb']/@defaultLayer/@nodeMappings[name='EClassWithLabelOutside']" targetFinderExpression="var:self">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription labelExpression="defaultStyle&lt;%eReferences.nFirst.name%>">
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/compartmentListEltsReorderingOnDirectEdit/vp1753.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/compartmentListEltsReorderingOnDirectEdit/vp1753.odesign
index bea14839cf..cf678d34b5 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/compartmentListEltsReorderingOnDirectEdit/vp1753.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/compartmentListEltsReorderingOnDirectEdit/vp1753.odesign
@@ -1,49 +1,51 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6Modif" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6Modif" version="10.0.0.201505222000">
   <ownedViewpoints endUserDocumentation="Provides graphical and tabular modelers to design an Ecore model." name="DesignModifItemList" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="EntitiesModif" titleExpression="&lt;%name%> package entities modif" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <edgeMappings name="EC_EReference" preconditionExpression="&lt;%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%render%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
           <conditionnalStyles predicateExpression="&lt;%containment &amp;&amp; derived%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-              <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="&lt;%render%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()">
+                <labelFormat>italic</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="&lt;%!containment &amp;&amp; derived%>">
-            <style sizeComputationExpression="1">
+            <style>
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-              <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="&lt;%render%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()">
+                <labelFormat>italic</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%render%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>" reconnections="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']">
-          <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree">
+        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']">
+          <style targetArrow="InputClosedArrow" routingStyle="tree">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
           <conditionnalStyles predicateExpression="&lt;%$view.targetNode.filter(&quot;EClass&quot;)[interface]%>">
-            <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree">
+            <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <centerLabelStyleDescription showIcon="false">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -51,37 +53,38 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List">
+        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="&lt;%current.eAllContents.sort(&quot;name&quot;)%>" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%self.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.name" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%self + eParameters%>" domainClass="EOperation">
-            <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="&lt;%self.name%>" labelAlignment="LEFT" tooltipExpression="&lt;%name%>(&lt;%eParameters.name.sep(&quot;, &quot;)%>) : &lt;%eType.name%>" sizeComputationExpression="2">
+          <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation">
+            <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.name" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>" domainClass="EEnum" childrenPresentation="List">
+        <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List">
           <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral">
             <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -89,7 +92,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -97,7 +100,7 @@
           </style>
         </containerMappings>
         <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EDataType&quot;)[eClass.name == &quot;EDataType&quot;]%>" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -111,7 +114,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -120,7 +123,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="abstract" valueExpression="true"/>
                 </firstModelOperations>
               </initialOperation>
@@ -177,7 +180,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -188,7 +191,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -201,7 +204,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']">
+          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -241,7 +244,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -251,8 +254,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -266,28 +269,28 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element.eContainer()%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element.eContainer()">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element.eContainer()%>">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$otherEnd == $sourceView%>">
-                    <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$otherEnd == $edgeView.targetNode%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = sourceView">
+                    <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = edgeView.targetNode">
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                         <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/>
                       </subModelOperations>
                     </subModelOperations>
-                    <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$otherEnd != $edgeView.targetNode%>">
+                    <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd &lt;> edgeView.targetNode">
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:edgeView.targetNode.target"/>
                       </subModelOperations>
-                      <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$otherEnd.getTarget()%>">
+                      <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:otherEnd.getTarget()">
                         <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$otherEnd != $sourceView%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd &lt;> sourceView">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                       <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/>
                     </subModelOperations>
@@ -305,35 +308,35 @@
             <element name="element"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source!=$element%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source &lt;> element">
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                     <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$source==$element%>">
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$otherEnd == $sourceView%>">
-                    <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$otherEnd == $edgeView.targetNode%>">
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = sourceView">
+                    <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = edgeView.targetNode">
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                        <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                        <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                         <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                           <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:element"/>
                         </subModelOperations>
                       </subModelOperations>
                     </subModelOperations>
-                    <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$otherEnd != $edgeView.targetNode%>">
+                    <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd &lt;> edgeView.targetNode">
                       <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element">
                         <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/>
                         <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/>
                       </subModelOperations>
                     </subModelOperations>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%$otherEnd != $sourceView%>">
+                  <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd &lt;> sourceView">
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
-                      <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                      <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/>
                     </subModelOperations>
                     <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                      <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$edgeView.targetNode.getTarget()%>"/>
+                      <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
@@ -368,7 +371,7 @@
           <ownedTools xsi:type="tool:DirectEditLabel" documentation="- &quot;name&quot; : change the name of the operation" name="Operation Name" forceRefresh="true">
             <mask mask="{0}"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%self.name%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.name"/>
             </initialOperation>
           </ownedTools>
         </toolSections>
@@ -386,7 +389,7 @@
     </ownedRepresentations>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/edge/2303/tc2303.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/edge/2303/tc2303.odesign
index d9d2c9f5ea..ed3d821470 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/edge/2303/tc2303.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/edge/2303/tc2303.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="description" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="description" version="10.0.0.201505222000">
   <ownedViewpoints endUserDocumentation="2262&#xD;&#xA;" name="tc2303" label="TC2303" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc2303" label="tc2303" domainClass="EPackage" enablePopupBars="true">
       <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
@@ -7,7 +7,7 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subContainerMappings[name='EClassContainerMapping2']/@subNodeMappings[name='EReferenceMapping']"/>
       </filters>
       <defaultLayer name="Default" label="default">
-        <edgeMappings name="type" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subContainerMappings[name='EClassContainerMapping2']/@subNodeMappings[name='EReferenceMapping']/@borderedNodeMappings[name='BorderRef']" targetMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subContainerMappings[name='EClassContainerMapping2']/@subNodeMappings[name='EReferenceMapping']/@borderedNodeMappings[name='BorderRef']" targetFinderExpression="&lt;%eType.eContents%>">
+        <edgeMappings name="type" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subContainerMappings[name='EClassContainerMapping2']/@subNodeMappings[name='EReferenceMapping']/@borderedNodeMappings[name='BorderRef']" targetMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subContainerMappings[name='EClassContainerMapping2']/@subNodeMappings[name='EReferenceMapping']/@borderedNodeMappings[name='BorderRef']" targetFinderExpression="aql:self.eType.eContents()">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -15,7 +15,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="type1" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@borderedNodeMappings[name='BorderRef3']" targetMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@borderedNodeMappings[name='BorderRef3']" targetFinderExpression="&lt;%eType.eContents%>">
+        <edgeMappings name="type1" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@borderedNodeMappings[name='BorderRef3']" targetMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@borderedNodeMappings[name='BorderRef3']" targetFinderExpression="aql:self.eType.eContents()">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -23,7 +23,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="type2" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subContainerMappings[name='EClassContainerMapping2']/@borderedNodeMappings[name='BorderRef2']" targetMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subContainerMappings[name='EClassContainerMapping2']/@borderedNodeMappings[name='BorderRef2']" targetFinderExpression="&lt;%eType.eContents%>">
+        <edgeMappings name="type2" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subContainerMappings[name='EClassContainerMapping2']/@borderedNodeMappings[name='BorderRef2']" targetMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subContainerMappings[name='EClassContainerMapping2']/@borderedNodeMappings[name='BorderRef2']" targetFinderExpression="aql:self.eType.eContents()">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -47,7 +47,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EClassContainerMapping" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <containerMappings name="EClassContainerMapping" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass">
           <borderedNodeMappings name="BorderRef3" semanticCandidatesExpression="feature:eContents" domainClass="EReference">
             <style xsi:type="style:SquareDescription" showIcon="false" sizeComputationExpression="1" labelPosition="node">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -63,7 +63,7 @@
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
               </style>
             </borderedNodeMappings>
-            <subNodeMappings name="EReferenceMapping" semanticCandidatesExpression="&lt;%eReferences%>" domainClass="EReference">
+            <subNodeMappings name="EReferenceMapping" semanticCandidatesExpression="aql:self.eReferences" domainClass="EReference">
               <borderedNodeMappings name="BorderRef" semanticCandidatesExpression="var:self" domainClass="EReference">
                 <style xsi:type="style:SquareDescription" showIcon="false" sizeComputationExpression="1" labelPosition="node">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -77,14 +77,14 @@
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               </style>
             </subNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             </style>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -98,8 +98,8 @@
             <element name="element"/>
             <newViewContainer name="newContainerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newSemanticContainer">
-                <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newSemanticContainer">
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="eReferences" valueExpression="var:element"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -112,7 +112,7 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303_2']/@defaultLayer/@containerMappings[name='EClassContainerMapping2']/@subNodeMappings[name='EReferenceMapping']"/>
       </filters>
       <defaultLayer name="Default" label="default">
-        <edgeMappings name="type" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303_2']/@defaultLayer/@containerMappings[name='EClassContainerMapping2']/@subNodeMappings[name='EReferenceMapping']/@borderedNodeMappings[name='BorderRef']" targetMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303_2']/@defaultLayer/@containerMappings[name='EClassContainerMapping2']/@subNodeMappings[name='EReferenceMapping']/@borderedNodeMappings[name='BorderRef']" targetFinderExpression="&lt;%eType.eContents%>">
+        <edgeMappings name="type" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303_2']/@defaultLayer/@containerMappings[name='EClassContainerMapping2']/@subNodeMappings[name='EReferenceMapping']/@borderedNodeMappings[name='BorderRef']" targetMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303_2']/@defaultLayer/@containerMappings[name='EClassContainerMapping2']/@subNodeMappings[name='EReferenceMapping']/@borderedNodeMappings[name='BorderRef']" targetFinderExpression="aql:self.eType.eContents()">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -120,7 +120,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="type1" semanticCandidatesExpression="feature:eAllContents" targetFinderExpression="&lt;%eType.eContents%>">
+        <edgeMappings name="type1" semanticCandidatesExpression="feature:eAllContents" targetFinderExpression="aql:self.eType.eContents()">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -128,7 +128,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="type2" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303_2']/@defaultLayer/@containerMappings[name='EClassContainerMapping2']/@borderedNodeMappings[name='BorderRef2']" targetMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303_2']/@defaultLayer/@containerMappings[name='EClassContainerMapping2']/@borderedNodeMappings[name='BorderRef2']" targetFinderExpression="&lt;%eType.eContents%>">
+        <edgeMappings name="type2" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303_2']/@defaultLayer/@containerMappings[name='EClassContainerMapping2']/@borderedNodeMappings[name='BorderRef2']" targetMapping="//@ownedViewpoints[name='tc2303']/@ownedRepresentations[name='tc2303_2']/@defaultLayer/@containerMappings[name='EClassContainerMapping2']/@borderedNodeMappings[name='BorderRef2']" targetFinderExpression="aql:self.eType.eContents()">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -160,7 +160,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </borderedNodeMappings>
-          <subNodeMappings name="EReferenceMapping" label="EReferenceMapping" semanticCandidatesExpression="&lt;%eReferences%>" domainClass="EReference">
+          <subNodeMappings name="EReferenceMapping" label="EReferenceMapping" semanticCandidatesExpression="aql:self.eReferences" domainClass="EReference">
             <borderedNodeMappings name="BorderRef" semanticCandidatesExpression="var:self" domainClass="EReference">
               <style xsi:type="style:SquareDescription" showIcon="false" sizeComputationExpression="1" labelPosition="node">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -174,7 +174,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/full/uml2.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/full/uml2.odesign
index 0ba7fde64e..ea5436fcf6 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/full/uml2.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/full/uml2.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="uml2 modeler" name="uml2 modeler" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="uml2 modeler" name="uml2 modeler" version="10.0.0.201505222000">
   <ownedViewpoints documentation="Initialize an UML Analysis" name="UML Analysis workspace" modelFileExtension="uml">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Fake ViewPointDescription - factorize elements" name="Reused Description" domainClass="Model">
       <toolSection documentation="reused tools" name="reused tools">
@@ -40,8 +40,8 @@
       </toolSection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" documentation="Diagram for Packages" name="Package Diagram" domainClass="Model" preconditionExpression="">
-      <containerMappings name="PD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram']" preconditionExpression="&lt;%$container == eContainer()%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;Package&quot;)%>" documentation="Mapping to create packages." domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']">
-        <style xsi:type="style:FlatContainerStyleDescription" labelSize="10">
+      <containerMappings name="PD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram']" preconditionExpression="&lt;%$container == eContainer()%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" documentation="Mapping to create packages." domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
@@ -63,7 +63,7 @@
           </ownedTools>
         </subSections>
         <subSections name="drag &amp; drop">
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" documentation="Tool to Drag &amp; Drop a Package" name="PD_D&amp;D_Package" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']">
+          <ownedTools xsi:type="tool:ContainerDropDescription" documentation="Tool to Drag &amp; Drop a Package" name="PD_D&amp;D_Package" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -101,14 +101,15 @@
         </conditionnalStyles>
       </nodeMappings>
       <edgeMappings name="PH_Containment" deletionDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@toolSection/@ownedTools[name='Delete%20a%20contained%20in%20edge']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetFinderExpression="feature:eContainer">
-        <style lineStyle="dash" sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET">
+        <style lineStyle="dash" routingStyle="tree" foldingStyle="TARGET">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </edgeMappings>
       <edgeMappings name="PH_Import" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetFinderExpression="&lt;%importedPackage%>" sourceFinderExpression="feature:eContainer" domainClass="PackageImport" useDomainElement="true">
-        <style lineStyle="dot" sizeComputationExpression="1">
+        <style lineStyle="dot">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
-          <centerLabelStyleDescription labelFormat="bold" showIcon="false">
+          <centerLabelStyleDescription showIcon="false">
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
@@ -157,7 +158,7 @@
             </firstModelOperations>
           </initialOperation>
         </ownedTools>
-        <ownedTools xsi:type="tool:DiagramCreationDescription" name="InitHierarchy" precondition="&lt;%eContainer == null%>" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']">
+        <ownedTools xsi:type="tool:DiagramCreationDescription" name="InitHierarchy" precondition="aql:self.eContainer() == null" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']">
           <initialOperation/>
           <containerViewVariable name="containerView"/>
           <representationNameVariable name="diagramName"/>
@@ -166,46 +167,46 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='UC_D%26D_Actor']" documentation="Diagram for Use Cases" name="Use Case Diagram" domainClass="Package">
       <nodeMappings name="UCD_Actor" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" createElements="false" documentation="Mapping to create actors" domainClass="Actor">
-        <style xsi:type="style:WorkspaceImageDescription" labelSize="10" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.junit/images/Actor.png">
+        <style xsi:type="style:WorkspaceImageDescription" labelSize="10" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/Actor.png">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </style>
       </nodeMappings>
       <edgeMappings name="UCD_Association" semanticCandidatesExpression="&lt;%getRootContainer().eAllContents(&quot;Association&quot;)%>" semanticElements="&lt;%memberEnd + current%>" documentation="Mapping to create associations between actors and use cases" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="&lt;%memberEnd.type%>" sourceFinderExpression="&lt;%memberEnd.type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true">
-        <style targetArrow="NoDecoration" sizeComputationExpression="&lt;%2%>">
+        <style targetArrow="NoDecoration" sizeComputationExpression="2">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%&quot;&quot;%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:''">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
       <edgeMappings name="UCD_Extend" semanticCandidatesExpression="&lt;%getRootContainer().eAllContents(&quot;Extend&quot;)%>" semanticElements="&lt;%current + extension + extendedCase%>" documentation="Mapping to create Extends" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="&lt;%extendedCase%>" sourceFinderExpression="&lt;%extension%>" targetExpression="var:self" domainClass="Extend" useDomainElement="true" pathExpression="">
-        <style lineStyle="dash" sizeComputationExpression="&lt;%1%>">
+        <style lineStyle="dash">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="&lt;%&quot;&#xab; extend &#xbb;&quot;%>">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
-      <edgeMappings name="UCD_Include" semanticCandidatesExpression="&lt;%getRootContainer().eAllContents(&quot;Include&quot;)%>" semanticElements="&lt;%current + includingCase + addition%>" documentation="Mapping to create includes" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="&lt;%addition%>" sourceFinderExpression="&lt;%includingCase%>" targetExpression="var:self" domainClass="Include" useDomainElement="true">
-        <style lineStyle="dash" sizeComputationExpression="&lt;%1%>">
+      <edgeMappings name="UCD_Include" semanticCandidatesExpression="&lt;%getRootContainer().eAllContents(&quot;Include&quot;)%>" semanticElements="&lt;%current + includingCase + addition%>" documentation="Mapping to create includes" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="aql:self.addition" sourceFinderExpression="aql:self.includingCase" targetExpression="var:self" domainClass="Include" useDomainElement="true">
+        <style lineStyle="dash">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="&lt;%&quot;&#xab; include &#xbb;&quot;%>">
+          <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="&#xab; include &#xbb;">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
-      <edgeMappings name="UCD_Generalization" semanticCandidatesExpression="&lt;%getRootContainer().eAllContents(&quot;Actor&quot;).generalization%>" semanticElements="" documentation="Mapping to create generalizations" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetFinderExpression="&lt;%general%>" sourceFinderExpression="&lt;%specific%>" targetExpression="var:self" domainClass="Generalization" useDomainElement="true">
-        <style sizeComputationExpression="&lt;%2%>">
+      <edgeMappings name="UCD_Generalization" semanticCandidatesExpression="&lt;%getRootContainer().eAllContents(&quot;Actor&quot;).generalization%>" semanticElements="" documentation="Mapping to create generalizations" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" targetExpression="var:self" domainClass="Generalization" useDomainElement="true">
+        <style sizeComputationExpression="2">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%&quot;&quot;%>">
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:''">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
       <containerMappings name="UCD_Subject" preconditionExpression="&lt;%$container == eContainer()%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;Component&quot;)%>" documentation="Display subjects of this diagram." domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='UC_D%26D_UseCase']">
         <subNodeMappings name="UCD_UseCase" preconditionExpression="&lt;%subject.nContains($container)%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%nPut(&quot;e&quot;).nGet(&quot;e&quot;).getRootContainer().eAllContents(&quot;UseCase&quot;)[subject.nContains(current(1))]%>" documentation="Mapping to create Use Cases" domainClass="UseCase">
-          <style xsi:type="style:WorkspaceImageDescription" labelSize="10" sizeComputationExpression="14" labelPosition="node" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.junit/images/UseCase.png">
+          <style xsi:type="style:WorkspaceImageDescription" labelSize="10" sizeComputationExpression="14" labelPosition="node" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/UseCase.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -213,7 +214,7 @@
       </containerMappings>
       <toolSection name="use case tools">
         <subSections name="drag &amp; drop">
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" documentation="A Drag &amp; Drop tool to add actors" name="UC_D&amp;D_Actor" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']">
+          <ownedTools xsi:type="tool:ContainerDropDescription" documentation="A Drag &amp; Drop tool to add actors" name="UC_D&amp;D_Actor" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -222,7 +223,7 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newSemanticContainer"/>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" documentation="Tool to drag &amp; drop a use case" name="UC_D&amp;D_UseCase" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']">
+          <ownedTools xsi:type="tool:ContainerDropDescription" documentation="Tool to drag &amp; drop a use case" name="UC_D&amp;D_UseCase" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -277,7 +278,7 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Package&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(ecore::EPackage)">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Association" referenceName="packagedElement">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:source"/>
@@ -335,15 +336,15 @@
       </toolSection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Description to edit class diagrams" name="Class Diagram" domainClass="Package" preconditionExpression="&lt;%filter(&quot;Model&quot;).nSize() > 0%>">
-      <edgeMappings name="CD_Association_Class_To_Class" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Classifier&quot;).getAssociationP()%>" semanticElements="&lt;%current + memberEnd%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="&lt;%memberEnd.nGet(0).type%>" sourceFinderExpression="&lt;%memberEnd.nGet(1).type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression="">
-        <style sizeComputationExpression="1">
+      <edgeMappings name="CD_Association_Class_To_Class" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Classifier&quot;).getAssociationP()%>" semanticElements="aql:Sequence{self} + self.memberEnd" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.memberEnd->first().type" sourceFinderExpression="aql:self.memberEnd->at(2).type" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression="">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           <centerLabelStyleDescription labelSize="10" labelExpression="&lt;%if (memberEnd.nGet(0).isNavigableP) {%>&lt;%memberEnd.nGet(0).name%>&lt;%}%>&lt;%if (memberEnd.nGet(0).isNavigableP &amp;&amp; memberEnd.nGet(1).isNavigableP) {%> - &lt;%}%>&lt;%if (memberEnd.nGet(1).isNavigableP) {%>&lt;%memberEnd.nGet(1).name%>&lt;%}%>">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
         <conditionnalStyles predicateExpression="&lt;%$view.target.memberEnd.nGet(0).isNavigableP &amp;&amp; $view.target.memberEnd.nGet(1).isNavigableP%>">
-          <style sourceArrow="InputArrow">
+          <style sourceArrow="InputArrow" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -351,7 +352,7 @@
           </style>
         </conditionnalStyles>
         <conditionnalStyles predicateExpression="&lt;%$view.target.memberEnd.nGet(1).isNavigableP &amp;&amp; !$view.target.memberEnd.nGet(0).isNavigableP%>">
-          <style sourceArrow="InputArrow" targetArrow="NoDecoration">
+          <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -359,7 +360,7 @@
           </style>
         </conditionnalStyles>
         <conditionnalStyles predicateExpression="&lt;%!$view.target.memberEnd.nGet(0).isNavigableP &amp;&amp; !$view.target.memberEnd.nGet(1).isNavigableP%>">
-          <style targetArrow="NoDecoration">
+          <style targetArrow="NoDecoration" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -367,15 +368,15 @@
           </style>
         </conditionnalStyles>
       </edgeMappings>
-      <edgeMappings name="CD_Association_Class_To_Interface" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Classifier&quot;).getAssociationP()%>" semanticElements="&lt;%current + memberEnd%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="&lt;%memberEnd.nGet(0).type%>" sourceFinderExpression="&lt;%memberEnd.nGet(1).type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression="">
-        <style sizeComputationExpression="1">
+      <edgeMappings name="CD_Association_Class_To_Interface" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Classifier&quot;).getAssociationP()%>" semanticElements="aql:Sequence{self} + self.memberEnd" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.memberEnd->first().type" sourceFinderExpression="aql:self.memberEnd->at(2).type" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression="">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           <centerLabelStyleDescription labelSize="10" labelExpression="&lt;%if (memberEnd.nGet(0).isNavigableP) {%>&lt;%memberEnd.nGet(0).name%>&lt;%}%>&lt;%if (memberEnd.nGet(0).isNavigableP &amp;&amp; memberEnd.nGet(1).isNavigableP) {%> - &lt;%}%>&lt;%if (memberEnd.nGet(1).isNavigableP) {%>&lt;%memberEnd.nGet(1).name%>&lt;%}%>">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
         <conditionnalStyles predicateExpression="&lt;%$view.target.memberEnd.nGet(0).isNavigableP &amp;&amp; $view.target.memberEnd.nGet(1).isNavigableP%>">
-          <style sourceArrow="InputArrow">
+          <style sourceArrow="InputArrow" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -383,7 +384,7 @@
           </style>
         </conditionnalStyles>
         <conditionnalStyles predicateExpression="&lt;%$view.target.memberEnd.nGet(1).isNavigableP &amp;&amp; !$view.target.memberEnd.nGet(0).isNavigableP%>">
-          <style sourceArrow="InputArrow" targetArrow="NoDecoration">
+          <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -391,7 +392,7 @@
           </style>
         </conditionnalStyles>
         <conditionnalStyles predicateExpression="&lt;%!$view.target.memberEnd.nGet(0).isNavigableP &amp;&amp; !$view.target.memberEnd.nGet(1).isNavigableP%>">
-          <style targetArrow="NoDecoration">
+          <style targetArrow="NoDecoration" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -399,15 +400,15 @@
           </style>
         </conditionnalStyles>
       </edgeMappings>
-      <edgeMappings name="CD_Association_Interface_To_Interface" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DSemanticDecorator&quot;).target.filter(&quot;Classifier&quot;).getAssociationP()%>" semanticElements="&lt;%current + memberEnd%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="&lt;%memberEnd.nGet(0).type%>" sourceFinderExpression="&lt;%memberEnd.nGet(1).type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression="">
-        <style sizeComputationExpression="1">
+      <edgeMappings name="CD_Association_Interface_To_Interface" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DSemanticDecorator&quot;).target.filter(&quot;Classifier&quot;).getAssociationP()%>" semanticElements="aql:Sequence{self} + self.memberEnd" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.memberEnd->first().type" sourceFinderExpression="aql:self.memberEnd->at(2).type" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression="">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           <centerLabelStyleDescription labelSize="10" labelExpression="&lt;%if (memberEnd.nGet(0).isNavigableP) {%>&lt;%memberEnd.nGet(0).name%>&lt;%}%>&lt;%if (memberEnd.nGet(0).isNavigableP &amp;&amp; memberEnd.nGet(1).isNavigableP) {%> - &lt;%}%>&lt;%if (memberEnd.nGet(1).isNavigableP) {%>&lt;%memberEnd.nGet(1).name%>&lt;%}%>">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
         <conditionnalStyles predicateExpression="&lt;%$view.target.memberEnd.nGet(0).isNavigableP &amp;&amp; $view.target.memberEnd.nGet(1).isNavigableP%>">
-          <style sourceArrow="InputArrow">
+          <style sourceArrow="InputArrow" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -415,7 +416,7 @@
           </style>
         </conditionnalStyles>
         <conditionnalStyles predicateExpression="&lt;%$view.target.memberEnd.nGet(1).isNavigableP &amp;&amp; !$view.target.memberEnd.nGet(0).isNavigableP%>">
-          <style sourceArrow="InputArrow" targetArrow="NoDecoration">
+          <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -423,7 +424,7 @@
           </style>
         </conditionnalStyles>
         <conditionnalStyles predicateExpression="&lt;%!$view.target.memberEnd.nGet(0).isNavigableP &amp;&amp; !$view.target.memberEnd.nGet(1).isNavigableP%>">
-          <style targetArrow="NoDecoration">
+          <style targetArrow="NoDecoration" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -431,15 +432,15 @@
           </style>
         </conditionnalStyles>
       </edgeMappings>
-      <edgeMappings name="CD_Association_Interface_To_Class" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Classifier&quot;).getAssociationP()%>" semanticElements="&lt;%current + memberEnd%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="&lt;%memberEnd.nGet(0).type%>" sourceFinderExpression="&lt;%memberEnd.nGet(1).type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression="">
-        <style sizeComputationExpression="1">
+      <edgeMappings name="CD_Association_Interface_To_Class" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Classifier&quot;).getAssociationP()%>" semanticElements="aql:Sequence{self} + self.memberEnd" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.memberEnd->first().type" sourceFinderExpression="aql:self.memberEnd->at(2).type" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression="">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           <centerLabelStyleDescription labelSize="10" labelExpression="&lt;%if (memberEnd.nGet(0).isNavigableP) {%>&lt;%memberEnd.nGet(0).name%>&lt;%}%>&lt;%if (memberEnd.nGet(0).isNavigableP &amp;&amp; memberEnd.nGet(1).isNavigableP) {%> - &lt;%}%>&lt;%if (memberEnd.nGet(1).isNavigableP) {%>&lt;%memberEnd.nGet(1).name%>&lt;%}%>">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
         <conditionnalStyles predicateExpression="&lt;%$view.target.memberEnd.nGet(0).isNavigableP &amp;&amp; $view.target.memberEnd.nGet(1).isNavigableP%>">
-          <style sourceArrow="InputArrow">
+          <style sourceArrow="InputArrow" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -447,7 +448,7 @@
           </style>
         </conditionnalStyles>
         <conditionnalStyles predicateExpression="&lt;%$view.target.memberEnd.nGet(1).isNavigableP &amp;&amp; !$view.target.memberEnd.nGet(0).isNavigableP%>">
-          <style sourceArrow="InputArrow" targetArrow="NoDecoration">
+          <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -455,7 +456,7 @@
           </style>
         </conditionnalStyles>
         <conditionnalStyles predicateExpression="&lt;%!$view.target.memberEnd.nGet(0).isNavigableP &amp;&amp; !$view.target.memberEnd.nGet(1).isNavigableP%>">
-          <style targetArrow="NoDecoration">
+          <style targetArrow="NoDecoration" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -463,15 +464,15 @@
           </style>
         </conditionnalStyles>
       </edgeMappings>
-      <edgeMappings name="CD_Association_Interface_To_Enumeration" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Type&quot;).getAssociationP()%>" semanticElements="&lt;%current + memberEnd%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Enumeration']" targetFinderExpression="&lt;%memberEnd.nGet(0).type%>" sourceFinderExpression="&lt;%memberEnd.nGet(1).type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression="">
-        <style sizeComputationExpression="1">
+      <edgeMappings name="CD_Association_Interface_To_Enumeration" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Type&quot;).getAssociationP()%>" semanticElements="aql:Sequence{self} + self.memberEnd" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Enumeration']" targetFinderExpression="aql:self.memberEnd->first().type" sourceFinderExpression="aql:self.memberEnd->at(2).type" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression="">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           <centerLabelStyleDescription labelSize="10" labelExpression="&lt;%if (memberEnd.nGet(0).isNavigableP) {%>&lt;%memberEnd.nGet(0).name%>&lt;%}%>&lt;%if (memberEnd.nGet(0).isNavigableP &amp;&amp; memberEnd.nGet(1).isNavigableP) {%> - &lt;%}%>&lt;%if (memberEnd.nGet(1).isNavigableP) {%>&lt;%memberEnd.nGet(1).name%>&lt;%}%>">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
         <conditionnalStyles predicateExpression="&lt;%$view.target.memberEnd.nGet(0).isNavigableP &amp;&amp; $view.target.memberEnd.nGet(1).isNavigableP%>">
-          <style sourceArrow="InputArrow">
+          <style sourceArrow="InputArrow" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -479,7 +480,7 @@
           </style>
         </conditionnalStyles>
         <conditionnalStyles predicateExpression="&lt;%$view.target.memberEnd.nGet(1).isNavigableP &amp;&amp; !$view.target.memberEnd.nGet(0).isNavigableP%>">
-          <style sourceArrow="InputArrow" targetArrow="NoDecoration">
+          <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -487,7 +488,7 @@
           </style>
         </conditionnalStyles>
         <conditionnalStyles predicateExpression="&lt;%!$view.target.memberEnd.nGet(0).isNavigableP &amp;&amp; !$view.target.memberEnd.nGet(1).isNavigableP%>">
-          <style targetArrow="NoDecoration">
+          <style targetArrow="NoDecoration" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelSize="10">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -495,52 +496,52 @@
           </style>
         </conditionnalStyles>
       </edgeMappings>
-      <edgeMappings name="CD_Generalization_Class_To_Class" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Classifier&quot;).generalization%>" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="&lt;%general%>" sourceFinderExpression="&lt;%specific%>" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression="">
+      <edgeMappings name="CD_Generalization_Class_To_Class" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Classifier&quot;).generalization%>" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression="">
         <style sizeComputationExpression="2">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </style>
       </edgeMappings>
-      <edgeMappings name="CD_Generalization_Interface_To_Interface" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DSemanticDecorator&quot;).target.filter(&quot;Interface&quot;).generalization%>" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="&lt;%general%>" sourceFinderExpression="&lt;%specific%>" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression="">
+      <edgeMappings name="CD_Generalization_Interface_To_Interface" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DSemanticDecorator&quot;).target.filter(&quot;Interface&quot;).generalization%>" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression="">
         <style sizeComputationExpression="2">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </style>
       </edgeMappings>
-      <edgeMappings name="CD_InterfaceRealization" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Class&quot;).interfaceRealization%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="&lt;%contract%>" sourceFinderExpression="&lt;%implementingClassifier%>" targetExpression="" domainClass="InterfaceRealization" useDomainElement="true">
+      <edgeMappings name="CD_InterfaceRealization" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Class&quot;).interfaceRealization%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.contract" sourceFinderExpression="&lt;%implementingClassifier%>" targetExpression="" domainClass="InterfaceRealization" useDomainElement="true">
         <style lineStyle="dash" sizeComputationExpression="2">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </style>
       </edgeMappings>
-      <edgeMappings name="CD_Dependency_Class_To_Class" preconditionExpression="&lt;%filter(&quot;InterfaceRealization&quot;).nSize == 0%>" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Class&quot;).clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="&lt;%supplier%>" sourceFinderExpression="&lt;%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true">
-        <style lineStyle="dash" sizeComputationExpression="&lt;%1%>">
+      <edgeMappings name="CD_Dependency_Class_To_Class" preconditionExpression="&lt;%filter(&quot;InterfaceRealization&quot;).nSize == 0%>" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Class&quot;).clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true">
+        <style lineStyle="dash">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </edgeMappings>
-      <edgeMappings name="CD_Dependency_Class_To_Interface" preconditionExpression="&lt;%filter(&quot;InterfaceRealization&quot;).nSize == 0%>" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Class&quot;).clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="&lt;%supplier%>" sourceFinderExpression="&lt;%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true">
-        <style lineStyle="dash" sizeComputationExpression="&lt;%1%>">
+      <edgeMappings name="CD_Dependency_Class_To_Interface" preconditionExpression="&lt;%filter(&quot;InterfaceRealization&quot;).nSize == 0%>" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Class&quot;).clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true">
+        <style lineStyle="dash">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </edgeMappings>
-      <edgeMappings name="CD_Dependency_Interface_To_Class" preconditionExpression="&lt;%filter(&quot;InterfaceRealization&quot;).nSize == 0%>" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Interface&quot;).clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="&lt;%supplier%>" sourceFinderExpression="&lt;%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true">
-        <style lineStyle="dash" sizeComputationExpression="&lt;%1%>">
+      <edgeMappings name="CD_Dependency_Interface_To_Class" preconditionExpression="&lt;%filter(&quot;InterfaceRealization&quot;).nSize == 0%>" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Interface&quot;).clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true">
+        <style lineStyle="dash">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </edgeMappings>
-      <edgeMappings name="CD_Dependency_Interface_To_Interface" preconditionExpression="&lt;%filter(&quot;InterfaceRealization&quot;).nSize == 0%>" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Interface&quot;).clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="&lt;%supplier%>" sourceFinderExpression="&lt;%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true">
-        <style lineStyle="dash" sizeComputationExpression="&lt;%1%>">
+      <edgeMappings name="CD_Dependency_Interface_To_Interface" preconditionExpression="&lt;%filter(&quot;InterfaceRealization&quot;).nSize == 0%>" semanticCandidatesExpression="&lt;%$viewpoint.eAllContents(&quot;DecorateSemanticElement&quot;).target.filter(&quot;Interface&quot;).clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true">
+        <style lineStyle="dash">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </edgeMappings>
       <containerMappings name="CD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%(eContents.filter(&quot;Package&quot;) + packageImport.importedPackage).nMinimize%>" documentation="Mapping to create packages" domainClass="Package" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']">
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </containerMappings>
-      <containerMappings name="CD_Class" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Sequence%20Diagram']" preconditionExpression="&lt;%(filter(&quot;Class&quot;) + filter(&quot;DataType&quot;)).nSize() > 0%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%ownedType%>" documentation="Mapping to create classes" domainClass="Class" childrenPresentation="List">
+      <containerMappings name="CD_Class" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Sequence%20Diagram']" preconditionExpression="&lt;%(filter(&quot;Class&quot;) + filter(&quot;DataType&quot;)).nSize() > 0%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedType" documentation="Mapping to create classes" domainClass="Class" childrenPresentation="List">
         <subNodeMappings name="CD_Property" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%attribute%>" documentation="Mapping to create attributes" domainClass="Property">
-          <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%visibility.visibilityToString%> &lt;%name%> : &lt;%type.name%>" labelAlignment="LEFT" sizeComputationExpression="&lt;%2%>">
+          <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%visibility.visibilityToString%> &lt;%name%> : &lt;%type.name%>" labelAlignment="LEFT" sizeComputationExpression="2">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -553,31 +554,33 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
         </style>
-        <conditionnalStyles predicateExpression="&lt;%isAbstract%>">
-          <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+        <conditionnalStyles predicateExpression="aql:self.isAbstract">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>italic</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
           </style>
         </conditionnalStyles>
       </containerMappings>
-      <containerMappings name="CD_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%ownedType%>" documentation="Mapping to create interfaces" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
-        <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+      <containerMappings name="CD_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedType" documentation="Mapping to create interfaces" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
           <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
         </style>
-        <conditionnalStyles predicateExpression="&lt;%isAbstract%>">
-          <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+        <conditionnalStyles predicateExpression="aql:self.isAbstract">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>italic</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
@@ -585,22 +588,23 @@
         </conditionnalStyles>
       </containerMappings>
       <containerMappings name="CD_Enumeration" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%ownedType.filter(&quot;Enumeration&quot;)%>" semanticElements="" domainClass="Enumeration" childrenPresentation="List">
-        <subNodeMappings name="CD_EnumerationLiteral" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%ownedLiteral%>" domainClass="EnumerationLiteral">
-          <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="&lt;%2%>">
+        <subNodeMappings name="CD_EnumerationLiteral" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedLiteral" domainClass="EnumerationLiteral">
+          <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="2">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
           <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
         </style>
-        <conditionnalStyles predicateExpression="&lt;%isAbstract%>">
-          <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+        <conditionnalStyles predicateExpression="aql:self.isAbstract">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>italic</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
@@ -692,7 +696,7 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Package&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(ecore::EPackage)">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Association" referenceName="packagedElement">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%$target.name.toL1Case%>"/>
@@ -702,7 +706,7 @@
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%$source.name.toL1Case%>"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:source"/>
                   </subModelOperations>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="navigableOwnedEnd" valueExpression="&lt;%memberEnd.nGet(0)%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="navigableOwnedEnd" valueExpression="aql:self.memberEnd->first()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Association"/>
                 </subModelOperations>
               </firstModelOperations>
@@ -740,7 +744,7 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Package&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(ecore::EPackage)">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Dependency" referenceName="packagedElement">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="client" valueExpression="var:source"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="supplier" valueExpression="var:target"/>
@@ -771,24 +775,25 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@toolSection/@ownedTools[name='Drop%20Interface%20on%20canvas']" name="Component Diagram" domainClass="Package">
       <nodeMappings name="CO_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%eContainer(&quot;Model&quot;).eAllContents(&quot;Interface&quot;)%>" createElements="false" domainClass="Interface">
-        <style xsi:type="style:BundledImageDescription" labelFormat="italic" showIcon="false" shape="dot">
+        <style xsi:type="style:BundledImageDescription" showIcon="false" shape="dot">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>italic</labelFormat>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="CO_Usage" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="&lt;%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Usage" useDomainElement="true">
+      <edgeMappings name="CO_Usage" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Usage" useDomainElement="true">
         <style lineStyle="dot" sizeComputationExpression="2" routingStyle="manhattan">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
         </style>
       </edgeMappings>
-      <edgeMappings name="CO_Realization" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="&lt;%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="InterfaceRealization" useDomainElement="true">
+      <edgeMappings name="CO_Realization" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="InterfaceRealization" useDomainElement="true">
         <style sizeComputationExpression="2" routingStyle="manhattan">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
         </style>
       </edgeMappings>
       <edgeMappings name="CO_Redefined" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetFinderExpression="&lt;%redefinedPort%>" sourceFinderExpression="var:self" domainClass="Port">
-        <style lineStyle="dot" sizeComputationExpression="1">
+        <style lineStyle="dot">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
           <centerLabelStyleDescription showIcon="false">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -796,7 +801,7 @@
         </style>
       </edgeMappings>
       <edgeMappings name="CO_RedefinedImport" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']/@borderedNodeMappings[name='CO_PortImport']" targetFinderExpression="&lt;%redefinedPort%>" sourceFinderExpression="var:self" domainClass="Port">
-        <style lineStyle="dot" sizeComputationExpression="1">
+        <style lineStyle="dot">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
           <centerLabelStyleDescription showIcon="false">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -804,7 +809,7 @@
         </style>
       </edgeMappings>
       <containerMappings name="CO_Component" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;Component&quot;)%>" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']">
-        <borderedNodeMappings name="CO_Port" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%ownedAttribute%>" domainClass="Port">
+        <borderedNodeMappings name="CO_Port" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Port">
           <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -818,7 +823,7 @@
             </style>
           </conditionnalStyles>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -826,7 +831,7 @@
         </style>
       </containerMappings>
       <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="&lt;%eContainer(&quot;Model&quot;).eAllContents(&quot;Component&quot;) - eAllContents(&quot;Component&quot;)%>" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']">
-        <borderedNodeMappings name="CO_PortImport" semanticCandidatesExpression="&lt;%ownedAttribute%>" domainClass="Port">
+        <borderedNodeMappings name="CO_PortImport" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Port">
           <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -840,7 +845,7 @@
             </style>
           </conditionnalStyles>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
@@ -875,7 +880,7 @@
             </firstModelOperations>
           </initialOperation>
         </ownedTools>
-        <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop Interface on canvas" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']" dragSource="PROJECT_EXPLORER">
+        <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop Interface on canvas" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']" dragSource="PROJECT_EXPLORER">
           <oldContainer name="oldSemanticContainer"/>
           <newContainer name="newSemanticContainer"/>
           <element name="element"/>
@@ -924,24 +929,26 @@
       </toolSection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="State Machine Diagram" domainClass="StateMachine">
-      <edgeMappings name="SM_Transition" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetFinderExpression="&lt;%target%>" sourceFinderExpression="&lt;%source%>" domainClass="Transition" useDomainElement="true">
+      <edgeMappings name="SM_Transition" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="Transition" useDomainElement="true">
         <style sizeComputationExpression="2" routingStyle="manhattan">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-          <centerLabelStyleDescription labelSize="10" labelFormat="italic">
+          <centerLabelStyleDescription labelSize="10">
+            <labelFormat>italic</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
-        <conditionnalStyles predicateExpression="&lt;%eContents().nSize > 0%>">
-          <style>
+        <conditionnalStyles predicateExpression="aql:self.eContents()->size() > 0">
+          <style sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-            <centerLabelStyleDescription labelSize="10" labelFormat="italic">
+            <centerLabelStyleDescription labelSize="10">
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </conditionnalStyles>
       </edgeMappings>
       <containerMappings name="SM_Region" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="Region">
-        <subNodeMappings name="SM_State" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%subvertex%>" domainClass="Vertex">
+        <subNodeMappings name="SM_State" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.subvertex" domainClass="Vertex">
           <style xsi:type="style:BundledImageDescription" labelSize="10" showIcon="false" sizeComputationExpression="4">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -962,8 +969,9 @@
             </style>
           </conditionnalStyles>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -1037,7 +1045,7 @@
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Sequence Diagram" domainClass="Interaction">
       <nodeMappings name="SD_Lifeline" semanticCandidatesExpression="&lt;%lifeline%>" domainClass="Lifeline">
         <borderedNodeMappings name="SD_ExecutionSpecification" semanticCandidatesExpression="&lt;%coveredBy%>" domainClass="BehaviorExecutionSpecification" reusedBorderedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']/@borderedNodeMappings[name='SD_ExecutionSpecification']">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="&lt;%&quot;&quot;%>" sizeComputationExpression="1" labelPosition="node" resizeKind="NORTH_SOUTH" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:''" sizeComputationExpression="1" labelPosition="node" resizeKind="NORTH_SOUTH" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -1048,7 +1056,7 @@
         </style>
       </nodeMappings>
       <edgeMappings name="SD_Message_Lifeline_To_Lifeline" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="&lt;%message%>" semanticElements="&lt;%current + sendEvent + receiveEvent%>" documentation="Show all messages between two lifelines." sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']" targetFinderExpression="&lt;%receiveEvent.covered%>" sourceFinderExpression="&lt;%sendEvent.covered%>" targetExpression="var:self" domainClass="Message" useDomainElement="true" pathExpression="">
-        <style sizeComputationExpression="1" routingStyle="manhattan">
+        <style routingStyle="manhattan">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </style>
       </edgeMappings>
@@ -1071,7 +1079,7 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$source.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Message" referenceName="message">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Message"/>
                 </subModelOperations>
@@ -1098,7 +1106,7 @@
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$container.eContainer(&quot;Interaction&quot;)%>">
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="BehaviorExecutionSpecification" referenceName="fragment"/>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%($containerView + $containerView.ancestor)[target.filter(&quot;Lifeline&quot;).nSize() > 0].target%>">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredBy" valueExpression="&lt;%eContainer(&quot;Interaction&quot;).fragment.nLast%>"/>
@@ -1111,16 +1119,16 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Diagrams to show instances and relation between them." name="Object Diagram" domainClass="Package">
       <edgeMappings name="OD_Slot" semanticCandidatesExpression="&lt;%packagedElement.filter(&quot;InstanceSpecification&quot;).slot[value.filter(&quot;InstanceValue&quot;)]%>" semanticElements="&lt;%current + definingFeature%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@containerMappings[name='OD_InstanceSpecification']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@containerMappings[name='OD_InstanceSpecification']" targetFinderExpression="&lt;%value.filter(&quot;InstanceValue&quot;).instance%>" sourceFinderExpression="&lt;%owningInstance%>" domainClass="Slot" useDomainElement="true">
-        <style sizeComputationExpression="&lt;%1%>">
+        <style>
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           <centerLabelStyleDescription labelExpression="&lt;%definingFeature.name%>">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
       </edgeMappings>
-      <containerMappings name="OD_InstanceSpecification" semanticCandidatesExpression="&lt;%packagedElement%>" semanticElements="" domainClass="InstanceSpecification" childrenPresentation="List">
+      <containerMappings name="OD_InstanceSpecification" semanticCandidatesExpression="aql:self.packagedElement" semanticElements="" domainClass="InstanceSpecification" childrenPresentation="List">
         <subNodeMappings name="OD_SimpleSlot" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%slot[!values.filter(&quot;InstanceValue&quot;)]%>" domainClass="Slot"/>
-        <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelExpression="&lt;%name%> : &lt;%classifier.nGet(0).name%>">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="&lt;%name%> : &lt;%classifier.nGet(0).name%>">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/node/noderefresh.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/node/noderefresh.odesign
index 1536f4cd57..4de5728987 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/node/noderefresh.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/node/noderefresh.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="10.0.0.201505222000">
   <ownedViewpoints name="UML2" modelFileExtension="uml">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Node Class Diagram" domainClass="Package">
       <nodeMappings name="CD_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="Class">
@@ -38,7 +38,7 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Container Class Diagram with Semantic Candidates" domainClass="Package">
       <containerMappings name="CDSemantic_Class" semanticCandidatesExpression="&lt;%eContents.filter(&quot;Class&quot;)%>" domainClass="Class">
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -48,7 +48,7 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Container Class Diagram" domainClass="Package">
       <containerMappings name="CD_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="Class">
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -66,7 +66,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -76,7 +76,7 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Container Package Diagram" domainClass="Model">
       <containerMappings name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="Package">
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -86,7 +86,7 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Container Package Diagram with Precondition" domainClass="Model">
       <containerMappings name="Package" preconditionExpression="&lt;%name.endsWith(&quot;1&quot;)%>" semanticCandidatesExpression="feature:eAllContents" domainClass="Package">
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -95,8 +95,8 @@
       </containerMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Container Package Diagram with Semantic Candidate" domainClass="Model" rootExpression="">
-      <containerMappings name="Package" semanticCandidatesExpression="&lt;%eContents.filter(&quot;Package&quot;)%>" domainClass="Package">
-        <style xsi:type="style:FlatContainerStyleDescription">
+      <containerMappings name="Package" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="Package">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -104,9 +104,9 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Container Package Diagram with Recursive Package" domainClass="Model" rootExpression="&lt;%eContents.filter(&quot;Package&quot;)%>">
-      <containerMappings name="Package Recur" semanticCandidatesExpression="&lt;%eContents.filter(&quot;Package&quot;)%>" domainClass="Package" reusedContainerMappings="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Container%20Package%20Diagram%20with%20Recursive%20Package']/@containerMappings[name='Package%20Recur']">
-        <style xsi:type="style:FlatContainerStyleDescription">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Container Package Diagram with Recursive Package" domainClass="Model" rootExpression="aql:self.eContents()->filter(ecore::EPackage)">
+      <containerMappings name="Package Recur" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="Package" reusedContainerMappings="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Container%20Package%20Diagram%20with%20Recursive%20Package']/@containerMappings[name='Package%20Recur']">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -122,8 +122,8 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="ECD_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram']/@nodeMappings[name='ECD_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram']/@nodeMappings[name='ECD_Class']" targetFinderExpression="&lt;%attribute.type%>">
-        <style>
+      <edgeMappings name="ECD_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram']/@nodeMappings[name='ECD_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram']/@nodeMappings[name='ECD_Class']" targetFinderExpression="aql:self.attribute.type">
+        <style sizeComputationExpression="[eContents()->size()/]">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <centerLabelStyleDescription>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -139,8 +139,8 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="ECD_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Domain']/@nodeMappings[name='ECD_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Domain']/@nodeMappings[name='ECD_Class']" targetFinderExpression="&lt;%type%>" sourceFinderExpression="feature:eContainer" domainClass="Property" useDomainElement="true">
-        <style>
+      <edgeMappings name="ECD_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Domain']/@nodeMappings[name='ECD_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Domain']/@nodeMappings[name='ECD_Class']" targetFinderExpression="aql:self.type" sourceFinderExpression="feature:eContainer" domainClass="Property" useDomainElement="true">
+        <style sizeComputationExpression="[eContents()->size()/]">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <centerLabelStyleDescription>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -156,8 +156,8 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="ECD_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Model%20Scaling%20Class%20Diagram']/@nodeMappings[name='ECD_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Model%20Scaling%20Class%20Diagram']/@nodeMappings[name='ECD_Class']" targetFinderExpression="&lt;%type%>" sourceFinderExpression="feature:eContainer" domainClass="Property" useDomainElement="true">
-        <style>
+      <edgeMappings name="ECD_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Model%20Scaling%20Class%20Diagram']/@nodeMappings[name='ECD_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Model%20Scaling%20Class%20Diagram']/@nodeMappings[name='ECD_Class']" targetFinderExpression="aql:self.type" sourceFinderExpression="feature:eContainer" domainClass="Property" useDomainElement="true">
+        <style sizeComputationExpression="[eContents()->size()/]">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <centerLabelStyleDescription>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -166,8 +166,8 @@
       </edgeMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Edges Class Diagram with Container" domainClass="Package">
-      <edgeMappings name="ECD_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container']/@containerMappings[name='ECD_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container']/@containerMappings[name='ECD_Class']" targetFinderExpression="&lt;%attribute.type%>">
-        <style>
+      <edgeMappings name="ECD_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container']/@containerMappings[name='ECD_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container']/@containerMappings[name='ECD_Class']" targetFinderExpression="aql:self.attribute.type">
+        <style sizeComputationExpression="[eContents()->size()/]">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <centerLabelStyleDescription>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -175,7 +175,7 @@
         </style>
       </edgeMappings>
       <containerMappings name="ECD_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="Class">
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -184,8 +184,8 @@
       </containerMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Edges Class Diagram with Container with Edge Mapping precondition" domainClass="Package">
-      <edgeMappings name="ECD_PropertyEdge" preconditionExpression="&lt;%$source.eClass().name ==&quot;Class&quot; &amp;&amp; $target.eClass().name ==&quot;Class&quot;%>" semanticCandidatesExpression="feature:eAllContents" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container%20with%20Edge%20Mapping%20precondition']/@containerMappings[name='ECD_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container%20with%20Edge%20Mapping%20precondition']/@containerMappings[name='ECD_Class']" targetFinderExpression="&lt;%attribute.type%>">
-        <style>
+      <edgeMappings name="ECD_PropertyEdge" preconditionExpression="&lt;%$source.eClass().name ==&quot;Class&quot; &amp;&amp; $target.eClass().name ==&quot;Class&quot;%>" semanticCandidatesExpression="feature:eAllContents" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container%20with%20Edge%20Mapping%20precondition']/@containerMappings[name='ECD_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container%20with%20Edge%20Mapping%20precondition']/@containerMappings[name='ECD_Class']" targetFinderExpression="aql:self.attribute.type">
+        <style sizeComputationExpression="[eContents()->size()/]">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <centerLabelStyleDescription>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -193,7 +193,7 @@
         </style>
       </edgeMappings>
       <containerMappings name="ECD_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="Class">
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -209,8 +209,8 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="ECDCN_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container%20and%20Node']/@containerMappings[name='ECDCN_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container%20and%20Node']/@nodeMappings[name='ECDCN_Class']" targetFinderExpression="&lt;%attribute.type%>">
-        <style>
+      <edgeMappings name="ECDCN_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container%20and%20Node']/@containerMappings[name='ECDCN_Class']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Container%20and%20Node']/@nodeMappings[name='ECDCN_Class']" targetFinderExpression="aql:self.attribute.type">
+        <style sizeComputationExpression="[eContents()->size()/]">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <centerLabelStyleDescription>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -218,7 +218,7 @@
         </style>
       </edgeMappings>
       <containerMappings name="ECDCN_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="Class">
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -241,8 +241,8 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </style>
       </nodeMappings>
-      <edgeMappings name="ECDB_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Border%20to%20Node']/@nodeMappings[name='ECDB_Class']/@borderedNodeMappings[name='ECDB_BorderClass']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Border%20to%20Node']/@nodeMappings[name='ECDB_Class']/@borderedNodeMappings[name='ECDB_BorderClass']" targetFinderExpression="&lt;%attribute.type%>">
-        <style>
+      <edgeMappings name="ECDB_PropertyEdge" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Border%20to%20Node']/@nodeMappings[name='ECDB_Class']/@borderedNodeMappings[name='ECDB_BorderClass']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Edges%20Class%20Diagram%20with%20Border%20to%20Node']/@nodeMappings[name='ECDB_Class']/@borderedNodeMappings[name='ECDB_BorderClass']" targetFinderExpression="aql:self.attribute.type">
+        <style sizeComputationExpression="[eContents()->size()/]">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <centerLabelStyleDescription>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -274,7 +274,7 @@
         </style>
       </edgeMappings>
       <edgeMappings name="Browsing Path" semanticCandidatesExpression="var:self" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Package%20Diagram%20With%20paths']/@nodeMappings[name='Package']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Package%20Diagram%20With%20paths']/@nodeMappings[name='Package']" targetFinderExpression="&lt;%eAllContents(&quot;Package&quot;).nLast%>" sourceFinderExpression="&lt;%eAllContents(&quot;Package&quot;).nFirst%>" domainClass="Model" useDomainElement="true" pathExpression="&lt;%eAllContents(&quot;Package&quot;)%>" pathNodeMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Package%20Diagram%20With%20paths']/@nodeMappings[name='Package']">
-        <style lineStyle="dash" sizeComputationExpression="1">
+        <style lineStyle="dash">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           <centerLabelStyleDescription>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -306,7 +306,7 @@
         </style>
       </edgeMappings>
       <edgeMappings name="Browsing Path" semanticCandidatesExpression="var:self" sourceMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Package%20Diagram%20With%20paths%20and%20duplicate%20elements%20inside%20them']/@nodeMappings[name='Package']" targetMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Package%20Diagram%20With%20paths%20and%20duplicate%20elements%20inside%20them']/@nodeMappings[name='Package']" targetFinderExpression="&lt;%eAllContents(&quot;Package&quot;).nLast%>" sourceFinderExpression="&lt;%eAllContents(&quot;Package&quot;).nFirst%>" domainClass="Model" useDomainElement="true" pathExpression="&lt;%eAllContents(&quot;Package&quot;) + eAllContents(&quot;Package&quot;).nLast%>" pathNodeMapping="//@ownedViewpoints[name='UML2']/@ownedRepresentations[name='Package%20Diagram%20With%20paths%20and%20duplicate%20elements%20inside%20them']/@nodeMappings[name='Package']">
-        <style lineStyle="dash" sizeComputationExpression="1">
+        <style lineStyle="dash">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           <centerLabelStyleDescription>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -374,19 +374,19 @@
         </borderedNodeMappings>
         <subNodeMappings name="CCDP NodeProperty" semanticCandidatesExpression="feature:eAllContents" domainClass="Property">
           <borderedNodeMappings name="CCDP NodeProperty BN" semanticCandidatesExpression="var:self" domainClass="Property">
-            <style xsi:type="style:BundledImageDescription" labelExpression="2-&lt;%name%>" sizeComputationExpression="1" resizeKind="NSEW">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:'2-' + self.name" sizeComputationExpression="1" resizeKind="NSEW">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelExpression="1-&lt;%name%>" resizeKind="NSEW">
+          <style xsi:type="style:SquareDescription" labelExpression="aql:'1-' + self.name" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
@@ -402,36 +402,36 @@
       </toolSection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="LabelHiddenByDefault" domainClass="Package">
-      <nodeMappings name="PackageNode" semanticCandidatesExpression="&lt;%packagedElement%>" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Package">
-        <borderedNodeMappings name="BorderedOnNodeClass" semanticCandidatesExpression="&lt;%ownedType%>" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
+      <nodeMappings name="PackageNode" semanticCandidatesExpression="aql:self.packagedElement" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Package">
+        <borderedNodeMappings name="BorderedOnNodeClass" semanticCandidatesExpression="aql:self.ownedType" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
           <style xsi:type="style:BundledImageDescription" hideLabelByDefault="true" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:SquareDescription" sizeComputationExpression="10" hideLabelByDefault="true" resizeKind="NSEW">
+        <style xsi:type="style:SquareDescription" hideLabelByDefault="true" sizeComputationExpression="10" resizeKind="NSEW">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
         </style>
       </nodeMappings>
-      <containerMappings name="PackageContainer" semanticCandidatesExpression="&lt;%packagedElement%>" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Package">
-        <borderedNodeMappings name="BorderedOnContainerClass" semanticCandidatesExpression="&lt;%ownedType%>" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
+      <containerMappings name="PackageContainer" semanticCandidatesExpression="aql:self.packagedElement" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Package">
+        <borderedNodeMappings name="BorderedOnContainerClass" semanticCandidatesExpression="aql:self.ownedType" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
           <style xsi:type="style:BundledImageDescription" hideLabelByDefault="true" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </borderedNodeMappings>
-        <subNodeMappings name="ClassNodeInContainer" semanticCandidatesExpression="&lt;%ownedType%>" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
+        <subNodeMappings name="ClassNodeInContainer" semanticCandidatesExpression="aql:self.ownedType" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
           <style xsi:type="style:LozengeNodeDescription" hideLabelByDefault="true">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
@@ -460,8 +460,8 @@
       </toolSection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="LabelVisibleByDefault" domainClass="Package">
-      <nodeMappings name="PackageNode" semanticCandidatesExpression="&lt;%packagedElement%>" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Package">
-        <borderedNodeMappings name="BorderedOnNodeClass" semanticCandidatesExpression="&lt;%ownedType%>" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
+      <nodeMappings name="PackageNode" semanticCandidatesExpression="aql:self.packagedElement" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Package">
+        <borderedNodeMappings name="BorderedOnNodeClass" semanticCandidatesExpression="aql:self.ownedType" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
           <style xsi:type="style:BundledImageDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -474,22 +474,22 @@
           <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
         </style>
       </nodeMappings>
-      <containerMappings name="PackageContainer" semanticCandidatesExpression="&lt;%packagedElement%>" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Package">
-        <borderedNodeMappings name="BorderedOnContainerClass" semanticCandidatesExpression="&lt;%ownedType%>" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
+      <containerMappings name="PackageContainer" semanticCandidatesExpression="aql:self.packagedElement" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Package">
+        <borderedNodeMappings name="BorderedOnContainerClass" semanticCandidatesExpression="aql:self.ownedType" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
           <style xsi:type="style:BundledImageDescription" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </borderedNodeMappings>
-        <subNodeMappings name="ClassNodeInContainer" semanticCandidatesExpression="&lt;%ownedType%>" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
+        <subNodeMappings name="ClassNodeInContainer" semanticCandidatesExpression="aql:self.ownedType" domainClass="http://www.eclipse.org/uml2/2.0.0/UML#//Class">
           <style xsi:type="style:LozengeNodeDescription">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/ecore.odesign
index cc5c8c06e7..e6de3b9f67 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/ecore.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/ecore.odesign
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="10.0.0.201505222000">
   <ownedViewpoints name="Design861" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities" titleExpression="&lt;%name%> package entities" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true">
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
       </filters>
@@ -12,44 +12,44 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features">
-        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="&lt;%filter(&quot;EStructuralFeature&quot;).derived == false%>"/>
+        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/>
       </filters>
       <validationSet>
-        <ownedRules xsi:type="validation:ViewValidationRule" message="The &lt;%target.name%> class is never used" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+        <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
           <audits auditExpression="&lt;%(((target + target.eAllSuperTypes).~.filter(&quot;EClass&quot;) + (target + target.eAllSuperTypes).~.filter(&quot;EReference&quot;) ) - target.eAllStructuralFeatures).nSize != 0%>"/>
           <fixes name="Remove Element">
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%target%>">
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target">
                 <subModelOperations xsi:type="tool:RemoveElement"/>
               </firstModelOperations>
             </initialOperation>
           </fixes>
         </ownedRules>
-        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The &lt;%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <audits auditExpression="&lt;%target.eAllSuperTypes.nSize &lt; 4%>"/>
+        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+          <audits auditExpression="aql:self.target.eAllSuperTypes->size() &lt; 4"/>
         </ownedRules>
       </validationSet>
       <defaultLayer name="Default">
-        <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="//@ownedViewpoin" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="//@ownedViewpoin" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%derived%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.derived">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <centerLabelStyleDescription showIcon="false" labelExpression="/&lt;%getEReferenceName()%>">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -57,15 +57,15 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']">
-          <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan">
+        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']">
+          <style targetArrow="InputClosedArrow" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
           <conditionnalStyles predicateExpression="&lt;%$target.filter(&quot;EClass&quot;)[interface]%>">
-            <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan">
+            <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="manhattan">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <centerLabelStyleDescription showIcon="false">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -73,9 +73,9 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -89,7 +89,7 @@
             </style>
           </subNodeMappings>
         </containerMappings>
-        <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>" domainClass="EEnum" childrenPresentation="List">
+        <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List">
           <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnumLiteral">
             <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -97,7 +97,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -105,15 +105,15 @@
           </style>
         </containerMappings>
         <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EDataType&quot;)[eClass.name == &quot;EDataType&quot;]%>" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EC External EClass" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EClass&quot;) - eContents.filter(&quot;EClass&quot;)%>" createElements="false" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%name%> in &lt;%eResourceName%>" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="&lt;%name%> in &lt;%eResourceName%>" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -127,7 +127,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -136,7 +136,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="abstract" valueExpression="true"/>
                 </firstModelOperations>
               </initialOperation>
@@ -166,7 +166,7 @@
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EEnum" referenceName="eClassifiers"/>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -206,7 +206,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']">
+          <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -246,7 +246,7 @@
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -256,8 +256,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -270,11 +270,11 @@
             <targetView name="targetView"/>
             <element name="element"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source!=element.eContainer()%>">
+              <firstModelOperations xsi:type="tool:If" conditionExpression="aql:source &lt;> element.eContainer()">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source==element.eContainer()%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eReferenceType" valueExpression="var:element"/>
                 </subModelOperations>
               </firstModelOperations>
@@ -288,11 +288,11 @@
             <targetView name="targetView"/>
             <element name="element"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source!=element.eContainer()%>">
+              <firstModelOperations xsi:type="tool:If" conditionExpression="aql:source &lt;> element.eContainer()">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:element"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source==element.eContainer()%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
                     <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:element"/>
                   </subModelOperations>
@@ -313,9 +313,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -324,9 +324,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%getReferenceNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="&lt;%getUpperBoundFromString($0)%>"/>
-                <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="&lt;%getLowerBoundFromString($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -334,19 +334,19 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%getOperationNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%createParameterFromString($0)%>"/>
+                <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Package" activeByDefault="true">
-        <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -354,7 +354,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -368,7 +368,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package &lt;%eContainer().eContents.filter(&quot;EPackage&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -382,7 +382,7 @@
       </additionalLayers>
       <additionalLayers name="Dynamic">
         <toolSections name="Dynamic">
-          <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="&lt;%filter(&quot;EClass&quot;)%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
+          <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -395,19 +395,20 @@
       </additionalLayers>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="Classes" domainClass="EPackage">
-      <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
-        <foregroundConditionalStyle predicateExpression="&lt;%abstract%>">
-          <style labelSize="10" labelFormat="italic">
+      <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
+        <foregroundConditionalStyle predicateExpression="aql:self.abstract">
+          <style labelSize="10">
+            <labelFormat>italic</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </foregroundConditionalStyle>
         <ownedSubLines name="Feature" domainClass="EStructuralFeature"/>
       </ownedLineMappings>
-      <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="&lt;%name%>">
+      <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="aql:self.name">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
         </defaultBackground>
-        <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
+        <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
           <ownedSubLines name="Feature" domainClass="EStructuralFeature"/>
         </ownedSubLines>
       </ownedLineMappings>
@@ -434,37 +435,37 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20']"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features">
-        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="&lt;%filter(&quot;EStructuralFeature&quot;).derived == false%>"/>
+        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/>
       </filters>
       <validationSet>
-        <ownedRules xsi:type="validation:ViewValidationRule" message="The &lt;%target.name%> class is never used" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
+        <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
           <audits auditExpression="&lt;%(((target + target.eAllSuperTypes).~.filter(&quot;EClass&quot;) + (target + target.eAllSuperTypes).~.filter(&quot;EReference&quot;) ) - target.eAllStructuralFeatures).nSize != 0%>"/>
         </ownedRules>
-        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The &lt;%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
-          <audits auditExpression="&lt;%target.eAllSuperTypes.nSize &lt; 4%>"/>
+        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
+          <audits auditExpression="aql:self.target.eAllSuperTypes->size() &lt; 4"/>
         </ownedRules>
       </validationSet>
       <defaultLayer name="Default">
-        <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;).eStructuralFeatures.filter(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;).eStructuralFeatures.filter(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+            <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+              <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -474,7 +475,7 @@
         </edgeMappings>
         <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EClass&quot;)%>" createElements="false" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -487,15 +488,16 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -510,7 +512,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -518,7 +520,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EDataType&quot;)%>" createElements="false" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -531,7 +533,7 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -575,7 +577,7 @@
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -624,9 +626,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -636,12 +638,12 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -660,37 +662,37 @@
   <ownedViewpoints name="Archetype" modelFileExtension="ecore">
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities With Archetypes" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities">
       <layers name="Archetypes" activeByDefault="true">
-        <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <conditionnalStyles predicateExpression="&lt;%isMomentInterval%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']">
+        <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+          <conditionnalStyles predicateExpression="aql:self.isMomentInterval()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isDescription%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']">
+          <conditionnalStyles predicateExpression="aql:self.isDescription()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isThing%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']">
+          <conditionnalStyles predicateExpression="aql:self.isThing()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isRole%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']">
+          <conditionnalStyles predicateExpression="aql:self.isRole()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isInterface%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.isInterface()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -704,15 +706,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new MomentInterval &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;MomentInterval&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new MomentInterval ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;MomentInterval&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;MomentInterval&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;MomentInterval&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -722,15 +724,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Description &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Description&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Description ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Description&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Description&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Description&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -740,15 +742,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Role &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Role&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Role ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Role&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Role&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Role&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -758,15 +760,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Thing &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Thing&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Thing ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Thing&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Thing&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Thing&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -787,7 +789,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%self + eAllContents(&quot;EPackage&quot;)%>" domainClass="EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="&lt;%name%> : &lt;%nsURI%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -797,22 +799,22 @@
       </defaultLayer>
       <additionalLayers name="Content">
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']">
-          <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+          <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
             <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-              <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+              <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
-            <conditionnalStyles predicateExpression="&lt;%abstract%>">
-              <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <conditionnalStyles predicateExpression="aql:self.abstract">
+              <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -827,19 +829,21 @@
       <defaultLayer name="Default">
         <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom">
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom">
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -848,15 +852,15 @@
         </containerMappings>
       </defaultLayer>
       <additionalLayers name="Used by">
-        <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="&lt;%~.filter(&quot;EReference&quot;)%>" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <centerLabelStyleDescription>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -864,7 +868,7 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Related Used by  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="&lt;%~.filter(&quot;EClass&quot;)%>">
+        <edgeMappings name="Related Used by  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -873,14 +877,14 @@
           </style>
         </edgeMappings>
         <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%(~.filter(&quot;EClass&quot;) + ~.filter(&quot;EReference&quot;).eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -890,15 +894,15 @@
         </containerMappings>
       </additionalLayers>
       <additionalLayers name="Uses">
-        <edgeMappings name="Related Use  EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eAllStructuralFeatures.filter(&quot;EReference&quot;).eType%>" sourceFinderExpression="" domainClass="EReference">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Related Use  EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eAllStructuralFeatures.filter(&quot;EReference&quot;).eType%>" sourceFinderExpression="" domainClass="EReference">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <centerLabelStyleDescription>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -906,7 +910,7 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Related Use  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Related Use  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -915,14 +919,14 @@
           </style>
         </edgeMappings>
         <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%(self.eAllStructuralFeatures.filter(&quot;EReference&quot;).eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -934,7 +938,7 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" domainClass="EClass">
       <defaultLayer name="Default">
-        <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -942,7 +946,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -952,36 +956,38 @@
         </edgeMappings>
         <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="H SuperTypes" semanticCandidatesExpression="&lt;%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -994,8 +1000,9 @@
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities">
       <layers name="Size">
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
+            <labelFormat>italic</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
@@ -1005,14 +1012,15 @@
   </ownedViewpoints>
   <ownedViewpoints name="Review" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Tags" domainClass="EPackage" initialHeaderColumnWidth="30">
-      <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
-        <defaultForeground labelSize="8" labelFormat="bold">
+      <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
+        <defaultForeground labelSize="8">
+          <labelFormat>bold</labelFormat>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </defaultForeground>
-        <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>"/>
+        <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"/>
       </ownedLineMappings>
       <ownedColumnMappings name="Available Tags" headerLabelExpression="&lt;%if (filter(&quot;EStructuralFeature&quot;) &amp;&amp; derived) {%>/&lt;%}%>&lt;%key%>" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="&lt;%getRootContainer.eAnnotations[source==&quot;Tags&quot;].details%>"/>
-      <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="&lt;%references%>" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;TagValues&quot;]%>" domainClass="EAnnotation">
+      <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="aql:self.references" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;TagValues&quot;]%>" domainClass="EAnnotation">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -1046,7 +1054,7 @@
         <variables name="root" documentation="The semantic element of the table."/>
         <variables name="element" documentation="The semantic currently edited element."/>
         <variables name="container" documentation="The semantic element corresponding to the view container."/>
-        <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%getRootContainer()%>">
+        <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()">
           <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%eAnnotations[source==&quot;Tags&quot;].nSize == 0%>">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation">
               <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="Tags"/>
@@ -1061,18 +1069,18 @@
       </createColumn>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Documentation" domainClass="EPackage">
-      <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
+      <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
         </defaultBackground>
-        <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
+        <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
           <defaultBackground>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
           </defaultBackground>
         </ownedSubLines>
       </ownedLineMappings>
-      <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="&lt;%getRootContainer%>"/>
-      <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="&lt;%value%>" useDomainClass="true" columnFinderExpression="&lt;%getRootContainer()%>" lineFinderExpression="&lt;%eContainer(&quot;EAnnotation&quot;).eContainer()%>" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;http://www.eclipse.org/emf/2002/GenModel&quot;].details[key==&quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
+      <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/>
+      <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="&lt;%eContainer(&quot;EAnnotation&quot;).eContainer()%>" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;http://www.eclipse.org/emf/2002/GenModel&quot;].details[key==&quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -1112,9 +1120,9 @@
   </ownedViewpoints>
   <ownedViewpoints name="Generation" modelFileExtension="genmodel">
     <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage">
-      <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="&lt;%ecoreClass.name%>">
-        <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="&lt;%eAllContents(&quot;GenFeature&quot;)[ecoreFeature.filter(&quot;EAttribute&quot;) || (ecoreFeature.filter(&quot;EReference&quot;)  &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).containment &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).derived) ]%>" headerLabelExpression="&lt;%ecoreFeature.name%>">
-          <backgroundConditionalStyle predicateExpression="&lt;%propertyCategory == &quot;&quot;%>">
+      <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name">
+        <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="&lt;%eAllContents(&quot;GenFeature&quot;)[ecoreFeature.filter(&quot;EAttribute&quot;) || (ecoreFeature.filter(&quot;EReference&quot;)  &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).containment &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).derived) ]%>" headerLabelExpression="aql:self.ecoreFeature.name">
+          <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''">
             <style>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             </style>
@@ -1126,7 +1134,7 @@
     </ownedRepresentations>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/idAndLabels/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/idAndLabels/ecore.odesign
index adf3b33281..69122bb3c8 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/idAndLabels/ecore.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/idAndLabels/ecore.odesign
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="10.0.0.201505222000">
   <ownedViewpoints name="Design861" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities" titleExpression="&lt;%name%> package entities" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true">
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
       </filters>
@@ -12,44 +12,44 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features">
-        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="&lt;%filter(&quot;EStructuralFeature&quot;).derived == false%>"/>
+        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/>
       </filters>
       <validationSet>
-        <ownedRules xsi:type="validation:ViewValidationRule" message="The &lt;%target.name%> class is never used" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+        <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
           <audits auditExpression="&lt;%(((target + target.eAllSuperTypes).~.filter(&quot;EClass&quot;) + (target + target.eAllSuperTypes).~.filter(&quot;EReference&quot;) ) - target.eAllStructuralFeatures).nSize != 0%>"/>
           <fixes name="Remove Element">
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%target%>">
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target">
                 <subModelOperations xsi:type="tool:RemoveElement"/>
               </firstModelOperations>
             </initialOperation>
           </fixes>
         </ownedRules>
-        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The &lt;%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <audits auditExpression="&lt;%target.eAllSuperTypes.nSize &lt; 4%>"/>
+        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+          <audits auditExpression="aql:self.target.eAllSuperTypes->size() &lt; 4"/>
         </ownedRules>
       </validationSet>
       <defaultLayer name="Default">
-        <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="//@ownedViewpoin" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="//@ownedViewpoin" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%derived%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.derived">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <centerLabelStyleDescription showIcon="false" labelExpression="/&lt;%getEReferenceName()%>">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -57,15 +57,15 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']">
-          <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan">
+        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']">
+          <style targetArrow="InputClosedArrow" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
           <conditionnalStyles predicateExpression="&lt;%$target.filter(&quot;EClass&quot;)[interface]%>">
-            <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan">
+            <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="manhattan">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <centerLabelStyleDescription showIcon="false">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -73,9 +73,9 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -88,14 +88,14 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>" domainClass="EEnum" childrenPresentation="List">
+        <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List">
           <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnumLiteral">
             <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -103,7 +103,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -111,15 +111,15 @@
           </style>
         </containerMappings>
         <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EDataType&quot;)[eClass.name == &quot;EDataType&quot;]%>" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EC External EClass" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EClass&quot;) - eContents.filter(&quot;EClass&quot;)%>" createElements="false" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%name%> in &lt;%eResourceName%>" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="&lt;%name%> in &lt;%eResourceName%>" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -133,7 +133,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -142,7 +142,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="abstract" valueExpression="true"/>
                 </firstModelOperations>
               </initialOperation>
@@ -172,7 +172,7 @@
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EEnum" referenceName="eClassifiers"/>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -212,7 +212,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']">
+          <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -252,7 +252,7 @@
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -262,8 +262,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -276,11 +276,11 @@
             <targetView name="targetView"/>
             <element name="element"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source!=element.eContainer()%>">
+              <firstModelOperations xsi:type="tool:If" conditionExpression="aql:source &lt;> element.eContainer()">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source==element.eContainer()%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eReferenceType" valueExpression="var:element"/>
                 </subModelOperations>
               </firstModelOperations>
@@ -294,11 +294,11 @@
             <targetView name="targetView"/>
             <element name="element"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source!=element.eContainer()%>">
+              <firstModelOperations xsi:type="tool:If" conditionExpression="aql:source &lt;> element.eContainer()">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:element"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source==element.eContainer()%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
                     <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:element"/>
                   </subModelOperations>
@@ -319,9 +319,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -330,9 +330,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%getReferenceNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="&lt;%getUpperBoundFromString($0)%>"/>
-                <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="&lt;%getLowerBoundFromString($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -340,19 +340,19 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%getOperationNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%createParameterFromString($0)%>"/>
+                <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Package" activeByDefault="true">
-        <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -360,7 +360,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -374,7 +374,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package &lt;%eContainer().eContents.filter(&quot;EPackage&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -388,7 +388,7 @@
       </additionalLayers>
       <additionalLayers name="Dynamic">
         <toolSections name="Dynamic">
-          <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="&lt;%filter(&quot;EClass&quot;)%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
+          <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -401,19 +401,20 @@
       </additionalLayers>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="Classes" domainClass="EPackage">
-      <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
-        <foregroundConditionalStyle predicateExpression="&lt;%abstract%>">
-          <style labelSize="10" labelFormat="italic">
+      <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
+        <foregroundConditionalStyle predicateExpression="aql:self.abstract">
+          <style labelSize="10">
+            <labelFormat>italic</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </foregroundConditionalStyle>
         <ownedSubLines name="Feature" domainClass="EStructuralFeature"/>
       </ownedLineMappings>
-      <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="&lt;%name%>">
+      <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="aql:self.name">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
         </defaultBackground>
-        <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
+        <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
           <ownedSubLines name="Feature" domainClass="EStructuralFeature"/>
         </ownedSubLines>
       </ownedLineMappings>
@@ -440,37 +441,37 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20']"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features">
-        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="&lt;%filter(&quot;EStructuralFeature&quot;).derived == false%>"/>
+        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/>
       </filters>
       <validationSet>
-        <ownedRules xsi:type="validation:ViewValidationRule" message="The &lt;%target.name%> class is never used" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
+        <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
           <audits auditExpression="&lt;%(((target + target.eAllSuperTypes).~.filter(&quot;EClass&quot;) + (target + target.eAllSuperTypes).~.filter(&quot;EReference&quot;) ) - target.eAllStructuralFeatures).nSize != 0%>"/>
         </ownedRules>
-        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The &lt;%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
-          <audits auditExpression="&lt;%target.eAllSuperTypes.nSize &lt; 4%>"/>
+        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
+          <audits auditExpression="aql:self.target.eAllSuperTypes->size() &lt; 4"/>
         </ownedRules>
       </validationSet>
       <defaultLayer name="Default">
-        <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;).eStructuralFeatures.filter(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;).eStructuralFeatures.filter(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+            <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+              <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -480,7 +481,7 @@
         </edgeMappings>
         <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EClass&quot;)%>" createElements="false" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -493,15 +494,16 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -516,7 +518,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -524,7 +526,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EDataType&quot;)%>" createElements="false" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -537,7 +539,7 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -581,7 +583,7 @@
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -630,9 +632,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -642,12 +644,12 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -666,37 +668,37 @@
   <ownedViewpoints name="Archetype" modelFileExtension="ecore">
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities With Archetypes" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities">
       <layers name="Archetypes" activeByDefault="true">
-        <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <conditionnalStyles predicateExpression="&lt;%isMomentInterval%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']">
+        <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+          <conditionnalStyles predicateExpression="aql:self.isMomentInterval()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isDescription%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']">
+          <conditionnalStyles predicateExpression="aql:self.isDescription()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isThing%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']">
+          <conditionnalStyles predicateExpression="aql:self.isThing()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isRole%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']">
+          <conditionnalStyles predicateExpression="aql:self.isRole()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isInterface%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.isInterface()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -710,15 +712,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new MomentInterval &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;MomentInterval&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new MomentInterval ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;MomentInterval&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;MomentInterval&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;MomentInterval&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -728,15 +730,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Description &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Description&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Description ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Description&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Description&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Description&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -746,15 +748,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Role &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Role&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Role ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Role&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Role&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Role&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -764,15 +766,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Thing &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Thing&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Thing ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Thing&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Thing&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Thing&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -787,13 +789,13 @@
         <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="&lt;%((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainer(&quot;EPackage&quot;).nMinimize - self%>">
           <style lineStyle="dash" sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
-            <centerLabelStyleDescription labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
         <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%self + eAllContents(&quot;EPackage&quot;)%>" domainClass="EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="&lt;%name%> : &lt;%nsURI%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -803,22 +805,22 @@
       </defaultLayer>
       <additionalLayers name="Content">
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']">
-          <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+          <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
             <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-              <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+              <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
-            <conditionnalStyles predicateExpression="&lt;%abstract%>">
-              <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <conditionnalStyles predicateExpression="aql:self.abstract">
+              <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -833,19 +835,21 @@
       <defaultLayer name="Default">
         <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom">
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom">
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -854,39 +858,39 @@
         </containerMappings>
       </defaultLayer>
       <additionalLayers name="Used by">
-        <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="&lt;%~.filter(&quot;EReference&quot;)%>" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription labelExpression="&lt;%name%>">
+              <centerLabelStyleDescription labelExpression="aql:self.name">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Related Used by  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="&lt;%~.filter(&quot;EClass&quot;)%>">
+        <edgeMappings name="Related Used by  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
         <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%(~.filter(&quot;EClass&quot;) + ~.filter(&quot;EReference&quot;).eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -896,39 +900,39 @@
         </containerMappings>
       </additionalLayers>
       <additionalLayers name="Uses">
-        <edgeMappings name="Related Use  EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eAllStructuralFeatures.filter(&quot;EReference&quot;).eType%>" sourceFinderExpression="" domainClass="EReference">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Related Use  EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eAllStructuralFeatures.filter(&quot;EReference&quot;).eType%>" sourceFinderExpression="" domainClass="EReference">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription labelExpression="&lt;%name%>">
+              <centerLabelStyleDescription labelExpression="aql:self.name">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Related Use  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Related Use  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
         <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%(self.eAllStructuralFeatures.filter(&quot;EReference&quot;).eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -940,54 +944,56 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" domainClass="EClass">
       <defaultLayer name="Default">
-        <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
         <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="H SuperTypes" semanticCandidatesExpression="&lt;%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -1000,8 +1006,9 @@
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities">
       <layers name="Size">
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
+            <labelFormat>italic</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
@@ -1011,14 +1018,15 @@
   </ownedViewpoints>
   <ownedViewpoints name="Review" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Tags" domainClass="EPackage" initialHeaderColumnWidth="30">
-      <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
-        <defaultForeground labelSize="8" labelFormat="bold">
+      <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
+        <defaultForeground labelSize="8">
+          <labelFormat>bold</labelFormat>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </defaultForeground>
-        <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>"/>
+        <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"/>
       </ownedLineMappings>
       <ownedColumnMappings name="Available Tags" headerLabelExpression="&lt;%if (filter(&quot;EStructuralFeature&quot;) &amp;&amp; derived) {%>/&lt;%}%>&lt;%key%>" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="&lt;%getRootContainer.eAnnotations[source==&quot;Tags&quot;].details%>"/>
-      <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="&lt;%references%>" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;TagValues&quot;]%>" domainClass="EAnnotation">
+      <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="aql:self.references" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;TagValues&quot;]%>" domainClass="EAnnotation">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -1052,7 +1060,7 @@
         <variables name="root" documentation="The semantic element of the table."/>
         <variables name="element" documentation="The semantic currently edited element."/>
         <variables name="container" documentation="The semantic element corresponding to the view container."/>
-        <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%getRootContainer()%>">
+        <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()">
           <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%eAnnotations[source==&quot;Tags&quot;].nSize == 0%>">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation">
               <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="Tags"/>
@@ -1067,18 +1075,18 @@
       </createColumn>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Documentation" domainClass="EPackage">
-      <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
+      <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
         </defaultBackground>
-        <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
+        <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
           <defaultBackground>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
           </defaultBackground>
         </ownedSubLines>
       </ownedLineMappings>
-      <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="&lt;%getRootContainer%>"/>
-      <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="&lt;%value%>" useDomainClass="true" columnFinderExpression="&lt;%getRootContainer()%>" lineFinderExpression="&lt;%eContainer(&quot;EAnnotation&quot;).eContainer()%>" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;http://www.eclipse.org/emf/2002/GenModel&quot;].details[key==&quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
+      <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/>
+      <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="&lt;%eContainer(&quot;EAnnotation&quot;).eContainer()%>" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;http://www.eclipse.org/emf/2002/GenModel&quot;].details[key==&quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -1118,9 +1126,9 @@
   </ownedViewpoints>
   <ownedViewpoints name="Generation" modelFileExtension="genmodel">
     <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage">
-      <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="&lt;%ecoreClass.name%>">
-        <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="&lt;%eAllContents(&quot;GenFeature&quot;)[ecoreFeature.filter(&quot;EAttribute&quot;) || (ecoreFeature.filter(&quot;EReference&quot;)  &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).containment &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).derived) ]%>" headerLabelExpression="&lt;%ecoreFeature.name%>">
-          <backgroundConditionalStyle predicateExpression="&lt;%propertyCategory == &quot;&quot;%>">
+      <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name">
+        <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="&lt;%eAllContents(&quot;GenFeature&quot;)[ecoreFeature.filter(&quot;EAttribute&quot;) || (ecoreFeature.filter(&quot;EReference&quot;)  &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).containment &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).derived) ]%>" headerLabelExpression="aql:self.ecoreFeature.name">
+          <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''">
             <style>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             </style>
@@ -1132,7 +1140,7 @@
     </ownedRepresentations>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/layers/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/layers/ecore.odesign
index c0ecd6b1e8..cb8c86ec80 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/layers/ecore.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/layers/ecore.odesign
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="10.0.0.201505222000">
   <ownedViewpoints name="Design861" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities" titleExpression="&lt;%name%> package entities" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true">
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
       </filters>
@@ -12,44 +12,44 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features">
-        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="&lt;%filter(&quot;EStructuralFeature&quot;).derived == false%>"/>
+        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/>
       </filters>
       <validationSet>
-        <ownedRules xsi:type="validation:ViewValidationRule" message="The &lt;%target.name%> class is never used" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+        <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
           <audits auditExpression="&lt;%(((target + target.eAllSuperTypes).~.filter(&quot;EClass&quot;) + (target + target.eAllSuperTypes).~.filter(&quot;EReference&quot;) ) - target.eAllStructuralFeatures).nSize != 0%>"/>
           <fixes name="Remove Element">
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%target%>">
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target">
                 <subModelOperations xsi:type="tool:RemoveElement"/>
               </firstModelOperations>
             </initialOperation>
           </fixes>
         </ownedRules>
-        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The &lt;%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <audits auditExpression="&lt;%target.eAllSuperTypes.nSize &lt; 4%>"/>
+        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+          <audits auditExpression="aql:self.target.eAllSuperTypes->size() &lt; 4"/>
         </ownedRules>
       </validationSet>
       <defaultLayer name="Default">
-        <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="//@ownedViewpoin" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="//@ownedViewpoin" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%derived%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.derived">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               <centerLabelStyleDescription showIcon="false" labelExpression="/&lt;%getEReferenceName()%>">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -57,15 +57,15 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']">
-          <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan">
+        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']">
+          <style targetArrow="InputClosedArrow" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
           <conditionnalStyles predicateExpression="&lt;%$target.filter(&quot;EClass&quot;)[interface]%>">
-            <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan">
+            <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="manhattan">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <centerLabelStyleDescription showIcon="false">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -73,9 +73,9 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -88,13 +88,13 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:ShapeContainerStyleDescription">
+          <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>" domainClass="EEnum" childrenPresentation="List">
+        <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List">
           <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnumLiteral">
             <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -102,7 +102,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -110,15 +110,15 @@
           </style>
         </containerMappings>
         <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EDataType&quot;)[eClass.name == &quot;EDataType&quot;]%>" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EC External EClass" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EClass&quot;) - eContents.filter(&quot;EClass&quot;)%>" createElements="false" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%name%> in &lt;%eResourceName%>" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="&lt;%name%> in &lt;%eResourceName%>" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -132,7 +132,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -141,7 +141,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="abstract" valueExpression="true"/>
                 </firstModelOperations>
               </initialOperation>
@@ -171,7 +171,7 @@
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EEnum" referenceName="eClassifiers"/>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -211,7 +211,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']">
+          <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -251,7 +251,7 @@
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -261,8 +261,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -275,11 +275,11 @@
             <targetView name="targetView"/>
             <element name="element"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source!=element.eContainer()%>">
+              <firstModelOperations xsi:type="tool:If" conditionExpression="aql:source &lt;> element.eContainer()">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source==element.eContainer()%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eReferenceType" valueExpression="var:element"/>
                 </subModelOperations>
               </firstModelOperations>
@@ -293,11 +293,11 @@
             <targetView name="targetView"/>
             <element name="element"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source!=element.eContainer()%>">
+              <firstModelOperations xsi:type="tool:If" conditionExpression="aql:source &lt;> element.eContainer()">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:element"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$source==element.eContainer()%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()">
                   <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source">
                     <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:element"/>
                   </subModelOperations>
@@ -318,9 +318,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -329,9 +329,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%getReferenceNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="&lt;%getUpperBoundFromString($0)%>"/>
-                <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="&lt;%getLowerBoundFromString($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -339,19 +339,19 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%getOperationNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%createParameterFromString($0)%>"/>
+                <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
         </toolSections>
       </defaultLayer>
       <additionalLayers name="Package" activeByDefault="true">
-        <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -359,16 +359,16 @@
           </style>
         </containerMappings>
         <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
         </containerMappings>
-        <containerMappings xsi:type="description_1:ContainerMappingImport" name="Import  EC_Class" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+        <containerMappings xsi:type="description_1:ContainerMappingImport" name="Import  EC_Class" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
           <conditionnalStyles predicateExpression="&lt;%name == &quot;C11&quot;%>">
-            <style xsi:type="style:ShapeContainerStyleDescription">
+            <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -382,7 +382,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package">
                 <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package &lt;%eContainer().eContents.filter(&quot;EPackage&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -396,7 +396,7 @@
       </additionalLayers>
       <additionalLayers name="Dynamic">
         <toolSections name="Dynamic">
-          <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="&lt;%filter(&quot;EClass&quot;)%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
+          <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -409,19 +409,20 @@
       </additionalLayers>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="Classes" domainClass="EPackage">
-      <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
-        <foregroundConditionalStyle predicateExpression="&lt;%abstract%>">
-          <style labelSize="10" labelFormat="italic">
+      <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
+        <foregroundConditionalStyle predicateExpression="aql:self.abstract">
+          <style labelSize="10">
+            <labelFormat>italic</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </foregroundConditionalStyle>
         <ownedSubLines name="Feature" domainClass="EStructuralFeature"/>
       </ownedLineMappings>
-      <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="&lt;%name%>">
+      <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="aql:self.name">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
         </defaultBackground>
-        <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>">
+        <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)">
           <ownedSubLines name="Feature" domainClass="EStructuralFeature"/>
         </ownedSubLines>
       </ownedLineMappings>
@@ -448,37 +449,37 @@
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20']"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features">
-        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="&lt;%filter(&quot;EStructuralFeature&quot;).derived == false%>"/>
+        <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/>
       </filters>
       <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations">
         <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/>
       </filters>
       <validationSet>
-        <ownedRules xsi:type="validation:ViewValidationRule" message="The &lt;%target.name%> class is never used" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
+        <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
           <audits auditExpression="&lt;%(((target + target.eAllSuperTypes).~.filter(&quot;EClass&quot;) + (target + target.eAllSuperTypes).~.filter(&quot;EReference&quot;) ) - target.eAllStructuralFeatures).nSize != 0%>"/>
         </ownedRules>
-        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The &lt;%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
-          <audits auditExpression="&lt;%target.eAllSuperTypes.nSize &lt; 4%>"/>
+        <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']">
+          <audits auditExpression="aql:self.target.eAllSuperTypes->size() &lt; 4"/>
         </ownedRules>
       </validationSet>
       <defaultLayer name="Default">
-        <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;).eStructuralFeatures.filter(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;).eStructuralFeatures.filter(&quot;EReference&quot;)[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+            <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+              <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -488,7 +489,7 @@
         </edgeMappings>
         <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EClass&quot;)%>" createElements="false" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -501,15 +502,16 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -524,7 +526,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -532,7 +534,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%allRoots.eAllContents(&quot;EDataType&quot;)%>" createElements="false" domainClass="EDataType" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -545,7 +547,7 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -589,7 +591,7 @@
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -638,9 +640,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -650,12 +652,12 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -674,37 +676,37 @@
   <ownedViewpoints name="Archetype" modelFileExtension="ecore">
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities With Archetypes" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities">
       <layers name="Archetypes" activeByDefault="true">
-        <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <conditionnalStyles predicateExpression="&lt;%isMomentInterval%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']">
+        <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+          <conditionnalStyles predicateExpression="aql:self.isMomentInterval()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isDescription%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']">
+          <conditionnalStyles predicateExpression="aql:self.isDescription()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isThing%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']">
+          <conditionnalStyles predicateExpression="aql:self.isThing()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isRole%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']">
+          <conditionnalStyles predicateExpression="aql:self.isRole()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%isInterface%>">
-            <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.isInterface()">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -718,15 +720,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new MomentInterval &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;MomentInterval&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new MomentInterval ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;MomentInterval&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;MomentInterval&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;MomentInterval&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -736,15 +738,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Description &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Description&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Description ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Description&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Description&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Description&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -754,15 +756,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Role &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Role&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Role ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Role&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Role&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Role&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -772,15 +774,15 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EPackage&quot;)%>">
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)">
                   <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Thing &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>">
-                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Thing&quot;)%>"/>
+                    <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Thing ' + self.eContainer().eContents()->filter(ecore::EClass)->size()">
+                      <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Thing&quot;)"/>
                     </subModelOperations>
                   </subModelOperations>
                 </subModelOperations>
-                <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%$container.filter(&quot;EClass&quot;)%>">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%addArchetypeAnnotation(&quot;Thing&quot;)%>"/>
+                <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)">
+                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation(&quot;Thing&quot;)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -801,7 +803,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%self + eAllContents(&quot;EPackage&quot;)%>" domainClass="EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="&lt;%name%> : &lt;%nsURI%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -811,22 +813,22 @@
       </defaultLayer>
       <additionalLayers name="Content">
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']">
-          <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+          <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
             <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-              <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+              <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </style>
             </subNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
-            <conditionnalStyles predicateExpression="&lt;%abstract%>">
-              <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+            <conditionnalStyles predicateExpression="aql:self.abstract">
+              <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                 <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -841,19 +843,21 @@
       <defaultLayer name="Default">
         <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom">
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom">
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -862,15 +866,15 @@
         </containerMappings>
       </defaultLayer>
       <additionalLayers name="Used by">
-        <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="&lt;%~.filter(&quot;EReference&quot;)%>" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <centerLabelStyleDescription>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -878,7 +882,7 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Related Used by  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="&lt;%~.filter(&quot;EClass&quot;)%>">
+        <edgeMappings name="Related Used by  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -887,14 +891,14 @@
           </style>
         </edgeMappings>
         <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%(~.filter(&quot;EClass&quot;) + ~.filter(&quot;EReference&quot;).eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -904,15 +908,15 @@
         </containerMappings>
       </additionalLayers>
       <additionalLayers name="Uses">
-        <edgeMappings name="Related Use  EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eAllStructuralFeatures.filter(&quot;EReference&quot;).eType%>" sourceFinderExpression="" domainClass="EReference">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="Related Use  EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eAllStructuralFeatures.filter(&quot;EReference&quot;).eType%>" sourceFinderExpression="" domainClass="EReference">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <centerLabelStyleDescription>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -920,7 +924,7 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="Related Use  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Related Use  ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -929,14 +933,14 @@
           </style>
         </edgeMappings>
         <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%(self.eAllStructuralFeatures.filter(&quot;EReference&quot;).eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -948,7 +952,7 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" domainClass="EClass">
       <defaultLayer name="Default">
-        <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -956,7 +960,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="&lt;%eSuperTypes%>">
+        <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes">
           <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
@@ -966,36 +970,38 @@
         </edgeMappings>
         <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name" labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>bold</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="H SuperTypes" semanticCandidatesExpression="&lt;%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -1008,8 +1014,9 @@
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities">
       <layers name="Size">
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/>
+            <labelFormat>italic</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
@@ -1019,14 +1026,15 @@
   </ownedViewpoints>
   <ownedViewpoints name="Review" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Tags" domainClass="EPackage" initialHeaderColumnWidth="30">
-      <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
-        <defaultForeground labelSize="8" labelFormat="bold">
+      <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
+        <defaultForeground labelSize="8">
+          <labelFormat>bold</labelFormat>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </defaultForeground>
-        <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>"/>
+        <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"/>
       </ownedLineMappings>
       <ownedColumnMappings name="Available Tags" headerLabelExpression="&lt;%if (filter(&quot;EStructuralFeature&quot;) &amp;&amp; derived) {%>/&lt;%}%>&lt;%key%>" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="&lt;%getRootContainer.eAnnotations[source==&quot;Tags&quot;].details%>"/>
-      <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="&lt;%references%>" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;TagValues&quot;]%>" domainClass="EAnnotation">
+      <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="aql:self.references" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;TagValues&quot;]%>" domainClass="EAnnotation">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -1060,7 +1068,7 @@
         <variables name="root" documentation="The semantic element of the table."/>
         <variables name="element" documentation="The semantic currently edited element."/>
         <variables name="container" documentation="The semantic element corresponding to the view container."/>
-        <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%getRootContainer()%>">
+        <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()">
           <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%eAnnotations[source==&quot;Tags&quot;].nSize == 0%>">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation">
               <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="Tags"/>
@@ -1075,18 +1083,18 @@
       </createColumn>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Documentation" domainClass="EPackage">
-      <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
+      <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
         </defaultBackground>
-        <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="&lt;%eClass.name%> : &lt;%name%>">
+        <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name">
           <defaultBackground>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
           </defaultBackground>
         </ownedSubLines>
       </ownedLineMappings>
-      <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="&lt;%getRootContainer%>"/>
-      <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="&lt;%value%>" useDomainClass="true" columnFinderExpression="&lt;%getRootContainer()%>" lineFinderExpression="&lt;%eContainer(&quot;EAnnotation&quot;).eContainer()%>" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;http://www.eclipse.org/emf/2002/GenModel&quot;].details[key==&quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
+      <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/>
+      <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="&lt;%eContainer(&quot;EAnnotation&quot;).eContainer()%>" semanticCandidatesExpression="&lt;%eAllContents(&quot;EAnnotation&quot;)[source==&quot;http://www.eclipse.org/emf/2002/GenModel&quot;].details[key==&quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -1126,9 +1134,9 @@
   </ownedViewpoints>
   <ownedViewpoints name="Generation" modelFileExtension="genmodel">
     <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage">
-      <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="&lt;%ecoreClass.name%>">
-        <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="&lt;%eAllContents(&quot;GenFeature&quot;)[ecoreFeature.filter(&quot;EAttribute&quot;) || (ecoreFeature.filter(&quot;EReference&quot;)  &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).containment &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).derived) ]%>" headerLabelExpression="&lt;%ecoreFeature.name%>">
-          <backgroundConditionalStyle predicateExpression="&lt;%propertyCategory == &quot;&quot;%>">
+      <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name">
+        <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="&lt;%eAllContents(&quot;GenFeature&quot;)[ecoreFeature.filter(&quot;EAttribute&quot;) || (ecoreFeature.filter(&quot;EReference&quot;)  &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).containment &amp;&amp; !ecoreFeature.filter(&quot;EReference&quot;).derived) ]%>" headerLabelExpression="aql:self.ecoreFeature.name">
+          <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''">
             <style>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             </style>
@@ -1140,7 +1148,7 @@
     </ownedRepresentations>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tables.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tables.odesign
index 648a0a7866..503bb7457a 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tables.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tables.odesign
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="UML2 Tables tests" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="UML2 Tables tests" version="10.0.0.201505222000">
   <ownedViewpoints documentation="Sample of some UML tables " name="UML2 tables for tests" modelFileExtension="uml">
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Colored Classes Table" domainClass="Model">
       <ownedLineMappings name="Model Classes" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Class%20and%20subClass%20with%20some%20attributes']/@ownedRepresentationCreationDescriptions[name='To%20Class%20and%20subClass%20with%20some%20attributes']" domainClass="Class" semanticCandidatesExpression="" headerLabelExpression="Class : &lt;%name%>">
         <defaultForeground>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
         </defaultForeground>
-        <foregroundConditionalStyle predicateExpression="&lt;%isAbstract%>">
+        <foregroundConditionalStyle predicateExpression="aql:self.isAbstract">
           <style labelSize="9">
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </foregroundConditionalStyle>
         <ownedSubLines name="Property" domainClass="Property" headerLabelExpression="Property">
-          <defaultForeground labelSize="8" labelFormat="italic">
+          <defaultForeground labelSize="8">
+            <labelFormat>italic</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </defaultForeground>
           <create name="Create Property">
@@ -27,7 +28,7 @@
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
         </create>
       </ownedLineMappings>
-      <ownedColumnMappings name="name" headerLabelExpression="name" featureName="name" labelExpression="&lt;%name%>">
+      <ownedColumnMappings name="name" headerLabelExpression="name" featureName="name" labelExpression="aql:self.name">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -37,34 +38,37 @@
           </firstModelOperation>
           <mask mask="{0}"/>
         </directEdit>
-        <defaultForeground labelFormat="italic">
+        <defaultForeground>
+          <labelFormat>italic</labelFormat>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </defaultForeground>
-        <foregroundConditionalStyle predicateExpression="&lt;%isAbstract%>">
-          <style labelFormat="bold">
+        <foregroundConditionalStyle predicateExpression="aql:self.isAbstract">
+          <style>
+            <labelFormat>bold</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </foregroundConditionalStyle>
       </ownedColumnMappings>
-      <ownedColumnMappings name="isAbstract" headerLabelExpression="isAbstract ?" featureName="isAbstract" labelExpression="&lt;%isAbstract%>">
-        <backgroundConditionalStyle predicateExpression="&lt;%isAbstract%>">
+      <ownedColumnMappings name="isAbstract" headerLabelExpression="isAbstract ?" featureName="isAbstract" labelExpression="aql:self.isAbstract">
+        <backgroundConditionalStyle predicateExpression="aql:self.isAbstract">
           <style>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           </style>
         </backgroundConditionalStyle>
       </ownedColumnMappings>
-      <ownedColumnMappings name="is Active mapping" headerLabelExpression="Active ?" featureName="isActive" labelExpression="&lt;%isActive%>">
-        <foregroundConditionalStyle predicateExpression="&lt;%isActive%>">
-          <style labelSize="14" labelFormat="italic">
+      <ownedColumnMappings name="is Active mapping" headerLabelExpression="Active ?" featureName="isActive" labelExpression="aql:self.isActive">
+        <foregroundConditionalStyle predicateExpression="aql:self.isActive">
+          <style labelSize="14">
+            <labelFormat>italic</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           </style>
         </foregroundConditionalStyle>
       </ownedColumnMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="Model Association Cross Table" domainClass="Model">
-      <ownedLineMappings name="CT Classes" domainClass="Class" headerLabelExpression="&lt;%name%>"/>
-      <ownedColumnMappings name="CT Classes Column" headerLabelExpression="&lt;%name%>" domainClass="Class"/>
-      <intersection name="Associations" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20Association%20Cross%20Table']/@ownedLineMappings[name='CT%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20Association%20Cross%20Table']/@ownedColumnMappings.0" labelExpression="&lt;%name%>" useDomainClass="true" columnFinderExpression="&lt;%memberEnd.nGet(1).type%>" lineFinderExpression="&lt;%memberEnd.nGet(0).type%>" domainClass="Association">
+      <ownedLineMappings name="CT Classes" domainClass="Class" headerLabelExpression="aql:self.name"/>
+      <ownedColumnMappings name="CT Classes Column" headerLabelExpression="aql:self.name" domainClass="Class"/>
+      <intersection name="Associations" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20Association%20Cross%20Table']/@ownedLineMappings[name='CT%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20Association%20Cross%20Table']/@ownedColumnMappings.0" labelExpression="aql:self.name" useDomainClass="true" columnFinderExpression="aql:self.memberEnd->at(2).type" lineFinderExpression="aql:self.memberEnd->first().type" domainClass="Association">
         <create name="New association">
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
           <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/>
@@ -81,30 +85,30 @@
       </intersection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="All Types and Instance" domainClass="Model">
-      <ownedLineMappings name="All EClasses" domainClass="EClass" semanticCandidatesExpression="&lt;%eAllContents().eClass.minimize.sort%>" headerLabelExpression="&lt;%name%>">
-        <ownedSubLines name="Instances" domainClass="EObject" semanticCandidatesExpression="&lt;%$root.eAllContents($container.name)%>" headerLabelExpression="&lt;%name%>"/>
+      <ownedLineMappings name="All EClasses" domainClass="EClass" semanticCandidatesExpression="&lt;%eAllContents().eClass.minimize.sort%>" headerLabelExpression="aql:self.name">
+        <ownedSubLines name="Instances" domainClass="EObject" semanticCandidatesExpression="&lt;%$root.eAllContents($container.name)%>" headerLabelExpression="aql:self.name"/>
       </ownedLineMappings>
       <ownedColumnMappings name="Instances count" headerLabelExpression="Count" featureName="Count" labelExpression="&lt;%$container.filter(&quot;EClass&quot;).$root.eAllContents($container.name).nSize%>"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="Model Generalization Cross Table" domainClass="Model">
-      <ownedLineMappings name="CT Generalization Classes" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="&lt;%name%>">
+      <ownedLineMappings name="CT Generalization Classes" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="aql:self.name">
         <create name="Create Line Class">
           <variables name="root" documentation="The semantic element of the table."/>
           <variables name="element" documentation="The semantic currently edited element."/>
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
-          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer()%>">
+          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element.eContainer()">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="&quot;&quot;">
               <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="ClassLine&lt;%$element.eContainer().ownedType.nSize%>"/>
             </subModelOperations>
           </firstModelOperation>
         </create>
       </ownedLineMappings>
-      <ownedColumnMappings name="CT Generalization Classes Column" headerLabelExpression="&lt;%name%>" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>">
+      <ownedColumnMappings name="CT Generalization Classes Column" headerLabelExpression="aql:self.name" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents().filter(&quot;Class&quot;).sort(&quot;name&quot;)%>">
         <create name="Create Column Class">
           <variables name="root" documentation="The semantic element of the table."/>
           <variables name="element" documentation="The semantic currently edited element."/>
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
-          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer()%>">
+          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element.eContainer()">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="&quot;&quot;">
               <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="ClassColumn&lt;%$element.eContainer().ownedType.nSize%>"/>
             </subModelOperations>
@@ -147,17 +151,17 @@
       </intersection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Class and subClass with some attributes" initialisation="true" domainClass="Model">
-      <ownedRepresentationCreationDescriptions xsi:type="description_1:TableCreationDescription" name="To Class and subClass with some attributes" browseExpression="&lt;%getRootContainer()%>" tableDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Class%20and%20subClass%20with%20some%20attributes']">
+      <ownedRepresentationCreationDescriptions xsi:type="description_1:TableCreationDescription" name="To Class and subClass with some attributes" browseExpression="aql:self.eResource().getContents()->first()" tableDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Class%20and%20subClass%20with%20some%20attributes']">
         <containerViewVariable name="containerView"/>
         <representationNameVariable name="tableName"/>
       </ownedRepresentationCreationDescriptions>
       <ownedLineMappings name="Class lines" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']/@toolSection/@ownedTools[name='Test%20Diagram']" navigationDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']/@toolSection/@ownedTools[name='Test%20Diagram%20Navigation']" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;)[generalization == null]%>" headerLabelExpression="">
-        <ownedSubLines name="SubClass lines" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="&lt;%name%>">
-          <create documentation="Create a concrete subclass (only for abstract class)" name="Create concrete subclass" precondition="&lt;%isAbstract%>">
+        <ownedSubLines name="SubClass lines" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="aql:self.name">
+          <create documentation="Create a concrete subclass (only for abstract class)" name="Create concrete subclass" precondition="aql:self.isAbstract">
             <variables name="root" documentation="The semantic element of the table."/>
             <variables name="element" documentation="The currently edited element."/>
             <variables name="container" documentation="The semantic element corresponding to the view container."/>
-            <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer()%>">
+            <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element.eContainer()">
               <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="&quot;&quot;">
                 <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="SubclassOf&lt;%$element.name%>&lt;%$element.eContainer().ownedType.nSize%>"/>
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="Generalization" referenceName="generalization" variableName="&quot;&quot;">
@@ -195,7 +199,7 @@
           <variables name="root" documentation="The semantic element of the table."/>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
-          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer()%>">
+          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element.eContainer()">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="&quot;&quot;">
               <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Class&lt;%$element.eContainer().ownedType.nSize%>"/>
             </subModelOperations>
@@ -205,13 +209,13 @@
           <variables name="root" documentation="The semantic element of the table."/>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
-          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer()%>">
+          <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:element.eContainer()">
             <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="&quot;&quot;">
               <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="OtherClass&lt;%$element.eContainer().ownedType.nSize%>"/>
             </subModelOperations>
           </firstModelOperation>
         </create>
-        <create documentation="Create a concrete subclass (only for abstract class)" name="Create concrete subclass" precondition="&lt;%isAbstract%>">
+        <create documentation="Create a concrete subclass (only for abstract class)" name="Create concrete subclass" precondition="aql:self.isAbstract">
           <variables name="root" documentation="The semantic element of the table."/>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="container" documentation="The semantic element corresponding to the view container."/>
@@ -228,7 +232,7 @@
           <variables name="element" documentation="The currently edited element."/>
           <variables name="root" documentation="The semantic element corresponding to the current table."/>
           <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="&lt;%$element.eContainer%>">
-            <subModelOperations xsi:type="tool:For" expression="&lt;%ownedType%>">
+            <subModelOperations xsi:type="tool:For" expression="aql:self.ownedType">
               <subModelOperations xsi:type="tool:RemoveElement"/>
             </subModelOperations>
           </firstModelOperation>
@@ -251,12 +255,12 @@
         <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:element">
           <subModelOperations xsi:type="tool:CreateInstance" typeName="Class" referenceName="ownedType" variableName="newClass">
             <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="AbstractClass&lt;%$element.ownedType.nSize%>"/>
-            <subModelOperations xsi:type="tool:SetValue" featureName="isAbstract" valueExpression="&lt;%true%>"/>
+            <subModelOperations xsi:type="tool:SetValue" featureName="isAbstract" valueExpression="aql:true"/>
           </subModelOperations>
         </firstModelOperation>
       </ownedCreateLine>
-      <ownedColumnMappings name="Class name" headerLabelExpression="Name" initialWidth="200" canEdit="&lt;%isAbstract%>" featureName="name" labelExpression="&lt;%name%>"/>
-      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="&lt;%isAbstract%>"/>
+      <ownedColumnMappings name="Class name" headerLabelExpression="Name" initialWidth="200" canEdit="aql:self.isAbstract" featureName="name" labelExpression="aql:self.name"/>
+      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="aql:self.isAbstract"/>
       <ownedColumnMappings name="Visibility of class" headerLabelExpression="Visibility" featureName="visibility" labelExpression="&lt;%visibility%>"/>
       <ownedColumnMappings name="CollaborationUse" headerLabelExpression="Representation" featureName="representation" labelExpression=""/>
       <ownedColumnMappings name="OwnedUseCase" headerLabelExpression="OwnedUseCase" featureName="ownedUseCase" labelExpression=""/>
@@ -288,7 +292,7 @@
           <mask mask="{0}"/>
         </directEdit>
       </ownedColumnMappings>
-      <ownedColumnMappings name="Commentaire" headerLabelExpression="Comment" featureName="body" labelExpression="&lt;%body%>" featureParentExpression="&lt;%ownedComment%>">
+      <ownedColumnMappings name="Commentaire" headerLabelExpression="Comment" featureName="body" labelExpression="aql:self.body" featureParentExpression="aql:self.ownedComment">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -297,7 +301,7 @@
             <subModelOperations xsi:type="tool:If" conditionExpression="&lt;%!(ownedComment)%>">
               <subModelOperations xsi:type="tool:CreateInstance" typeName="Comment" referenceName="ownedComment" variableName="newComment"/>
             </subModelOperations>
-            <subModelOperations xsi:type="tool:ChangeContext" browseExpression="&lt;%ownedComment%>">
+            <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.ownedComment">
               <subModelOperations xsi:type="tool:SetValue" featureName="body" valueExpression="var:arg0"/>
             </subModelOperations>
           </firstModelOperation>
@@ -306,7 +310,7 @@
       </ownedColumnMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_2:DiagramDescription" name="Just for test navigation" domainClass="Model">
-      <nodeMappings name="Package" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Class%20and%20subClass%20with%20some%20attributes']/@ownedRepresentationCreationDescriptions[name='To%20Class%20and%20subClass%20with%20some%20attributes']" semanticCandidatesExpression="feature:eAllContents" semanticElements="&lt;%packagedElement%>" domainClass="Package">
+      <nodeMappings name="Package" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Class%20and%20subClass%20with%20some%20attributes']/@ownedRepresentationCreationDescriptions[name='To%20Class%20and%20subClass%20with%20some%20attributes']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self.packagedElement" domainClass="Package">
         <style xsi:type="style:EllipseNodeDescription">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -314,7 +318,7 @@
         </style>
       </nodeMappings>
       <toolSection name="navigation">
-        <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="Test Diagram" browseExpression="&lt;%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']">
+        <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="Test Diagram" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']">
           <initialOperation/>
           <containerViewVariable name="containerView"/>
           <representationNameVariable name="diagramName"/>
@@ -323,7 +327,7 @@
           <containerViewVariable name="containerView"/>
           <representationNameVariable name="tableName"/>
         </ownedTools>
-        <ownedTools xsi:type="tool_1:DiagramNavigationDescription" name="Test Diagram Navigation" browseExpression="&lt;%getRootContainer()%>" navigationNameExpression="" diagramDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']">
+        <ownedTools xsi:type="tool_1:DiagramNavigationDescription" name="Test Diagram Navigation" browseExpression="aql:self.eResource().getContents()->first()" navigationNameExpression="" diagramDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Just%20for%20test%20navigation']">
           <containerViewVariable name="containerView"/>
           <containerVariable name="container"/>
           <representationNameVariable name="diagramName"/>
@@ -331,15 +335,15 @@
       </toolSection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="Model all associations" domainClass="Model">
-      <ownedRepresentationCreationDescriptions xsi:type="description_1:TableCreationDescription" name="To model all associations" browseExpression="&lt;%getRootContainer()%>" tableDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']">
+      <ownedRepresentationCreationDescriptions xsi:type="description_1:TableCreationDescription" name="To model all associations" browseExpression="aql:self.eResource().getContents()->first()" tableDescription="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']">
         <containerViewVariable name="containerView"/>
         <representationNameVariable name="tableName"/>
       </ownedRepresentationCreationDescriptions>
-      <ownedLineMappings name="Line Classes" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="&lt;%name%>">
-        <ownedSubLines name="Associations" domainClass="Association" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Association&quot;)[memberEnd.nGet(0).type == $container]%>" headerLabelExpression="&lt;%name%>"/>
+      <ownedLineMappings name="Line Classes" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="aql:self.name">
+        <ownedSubLines name="Associations" domainClass="Association" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Association&quot;)[memberEnd.nGet(0).type == $container]%>" headerLabelExpression="aql:self.name"/>
       </ownedLineMappings>
-      <ownedColumnMappings name="Column Classes" headerLabelExpression="&lt;%name%>" domainClass="Class"/>
-      <intersection name="Associations" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedLineMappings[name='Line%20Classes']/@ownedSubLines[name='Associations']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedColumnMappings.0" labelExpression="&lt;%name%>" columnFinderExpression="&lt;%if (memberEnd) {%>&lt;%memberEnd.nGet(1).type%>&lt;%}%>" lineFinderExpression="" semanticCandidatesExpression="" domainClass="" preconditionExpression="">
+      <ownedColumnMappings name="Column Classes" headerLabelExpression="aql:self.name" domainClass="Class"/>
+      <intersection name="Associations" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedLineMappings[name='Line%20Classes']/@ownedSubLines[name='Associations']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedColumnMappings.0" labelExpression="aql:self.name" columnFinderExpression="&lt;%if (memberEnd) {%>&lt;%memberEnd.nGet(1).type%>&lt;%}%>" lineFinderExpression="" semanticCandidatesExpression="" domainClass="" preconditionExpression="">
         <directEdit>
           <variables name="element" documentation="The currently edited element."/>
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
@@ -351,7 +355,7 @@
           <mask mask="{0}"/>
         </directEdit>
       </intersection>
-      <intersection name="isAtLeastOneAssociation" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedLineMappings[name='Line%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedColumnMappings.0" labelExpression="X" useDomainClass="true" columnFinderExpression="&lt;%if (memberEnd) {%>&lt;%memberEnd.nGet(1).type%>&lt;%}%>" lineFinderExpression="&lt;%memberEnd.nGet(0).type%>" domainClass="Association">
+      <intersection name="isAtLeastOneAssociation" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedLineMappings[name='Line%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedColumnMappings.0" labelExpression="X" useDomainClass="true" columnFinderExpression="&lt;%if (memberEnd) {%>&lt;%memberEnd.nGet(1).type%>&lt;%}%>" lineFinderExpression="aql:self.memberEnd->first().type" domainClass="Association">
         <create name="CreateAssociation">
           <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
           <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/>
@@ -375,16 +379,16 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Property" domainClass="Model">
       <ownedLineMappings name="Property lines" semanticElements="&lt;%self + lowerValue + upperValue%>" domainClass="Property" semanticCandidatesExpression="" headerLabelExpression="Property &lt;%name%>"/>
-      <ownedColumnMappings name="Property name" headerLabelExpression="Name" canEdit="" featureName="name" labelExpression="&lt;%name%>"/>
+      <ownedColumnMappings name="Property name" headerLabelExpression="Name" canEdit="" featureName="name" labelExpression="aql:self.name"/>
       <ownedColumnMappings name="Property Lower" headerLabelExpression="Lower" canEdit="" featureName="lower" labelExpression="&lt;%lower%>"/>
       <ownedColumnMappings name="Property Upper" headerLabelExpression="Upper" featureName="upper" labelExpression="&lt;%upper%>"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="Cross Table Colors" domainClass="Model">
-      <ownedLineMappings name="Line Color Classes" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedRepresentationCreationDescriptions[name='To%20model%20all%20associations']" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="&lt;%name%>">
+      <ownedLineMappings name="Line Color Classes" detailDescriptions="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Model%20all%20associations']/@ownedRepresentationCreationDescriptions[name='To%20model%20all%20associations']" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;).sort(&quot;name&quot;)%>" headerLabelExpression="aql:self.name">
         <defaultForeground>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </defaultForeground>
-        <ownedSubLines name="Properties Color" domainClass="Property" headerLabelExpression="&lt;%name%>">
+        <ownedSubLines name="Properties Color" domainClass="Property" headerLabelExpression="aql:self.name">
           <defaultForeground>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
           </defaultForeground>
@@ -395,7 +399,7 @@
           </defaultBackground>
         </ownedSubLines>
       </ownedLineMappings>
-      <ownedColumnMappings name="Column Color Classes" headerLabelExpression="&lt;%name%>" domainClass="Class">
+      <ownedColumnMappings name="Column Color Classes" headerLabelExpression="aql:self.name" domainClass="Class">
         <defaultForeground>
           <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
         </defaultForeground>
@@ -403,14 +407,15 @@
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
         </defaultBackground>
       </ownedColumnMappings>
-      <ownedColumnMappings name="Property  Column Color" headerLabelExpression="&lt;%name%>" domainClass="Property" semanticCandidatesExpression="&lt;%eAllContents(&quot;Property&quot;).nFirst%>">
+      <ownedColumnMappings name="Property  Column Color" headerLabelExpression="aql:self.name" domainClass="Property" semanticCandidatesExpression="&lt;%eAllContents(&quot;Property&quot;).nFirst%>">
         <defaultBackground>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
         </defaultBackground>
       </ownedColumnMappings>
-      <intersection name="Associations Color" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedLineMappings[name='Line%20Color%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedColumnMappings.0" labelExpression="&lt;%name%>" useDomainClass="true" columnFinderExpression="&lt;%memberEnd.nFirst.type%>" lineFinderExpression="&lt;%memberEnd.nLast.type%>" semanticCandidatesExpression="" domainClass="Association" preconditionExpression="">
+      <intersection name="Associations Color" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedLineMappings[name='Line%20Color%20Classes']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedColumnMappings.0" labelExpression="aql:self.name" useDomainClass="true" columnFinderExpression="&lt;%memberEnd.nFirst.type%>" lineFinderExpression="&lt;%memberEnd.nLast.type%>" semanticCandidatesExpression="" domainClass="Association" preconditionExpression="">
         <foregroundConditionalStyle predicateExpression="&lt;%isLeaf%>">
-          <style labelFormat="bold">
+          <style>
+            <labelFormat>bold</labelFormat>
             <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           </style>
         </foregroundConditionalStyle>
@@ -420,23 +425,23 @@
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
         </defaultBackground>
       </intersection>
-      <intersection name="Extends colors" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedLineMappings[name='Line%20Color%20Classes']/@ownedSubLines[name='Generalization%20colors']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedColumnMappings.0" labelExpression="extend" columnFinderExpression="&lt;%general%>"/>
+      <intersection name="Extends colors" lineMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedLineMappings[name='Line%20Color%20Classes']/@ownedSubLines[name='Generalization%20colors']" columnMapping="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Cross%20Table%20Colors']/@ownedColumnMappings.0" labelExpression="extend" columnFinderExpression="aql:self.general"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Simple hierarchy" domainClass="Model">
       <ownedLineMappings name="Class lines" domainClass="Class" semanticCandidatesExpression="&lt;%eAllContents(&quot;Class&quot;)[generalization == null]%>" headerLabelExpression="">
-        <ownedSubLines name="SubClass lines" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="&lt;%name%>">
-          <ownedSubLines name="SubClass lines 2" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="&lt;%name%>"/>
+        <ownedSubLines name="SubClass lines" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="aql:self.name">
+          <ownedSubLines name="SubClass lines 2" domainClass="Class" semanticCandidatesExpression="&lt;%$root.eAllContents(&quot;Class&quot;)[generalization.general == $container] + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].classifierBehavior + $root.eAllContents(&quot;Class&quot;)[generalization.general == $container].useCase%>" headerLabelExpression="aql:self.name"/>
         </ownedSubLines>
       </ownedLineMappings>
-      <ownedColumnMappings name="Class name" headerLabelExpression="Name" initialWidth="200" canEdit="&lt;%isAbstract%>" featureName="name" labelExpression="&lt;%name%>"/>
-      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="&lt;%isAbstract%>"/>
+      <ownedColumnMappings name="Class name" headerLabelExpression="Name" initialWidth="200" canEdit="aql:self.isAbstract" featureName="name" labelExpression="aql:self.name"/>
+      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="aql:self.isAbstract"/>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Reused hierarchy" domainClass="Model">
-      <ownedLineMappings name="Reused package lines" reusedSubLines="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Reused%20hierarchy']/@ownedLineMappings[name='Reused%20package%20lines']" reusedInMappings="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Reused%20hierarchy']/@ownedLineMappings[name='Reused%20package%20lines']" domainClass="Package" semanticCandidatesExpression="&lt;%packagedElement%>">
-        <ownedSubLines name="Class lines" domainClass="Class" semanticCandidatesExpression="&lt;%packagedElement%>" headerLabelExpression=""/>
+      <ownedLineMappings name="Reused package lines" reusedSubLines="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Reused%20hierarchy']/@ownedLineMappings[name='Reused%20package%20lines']" reusedInMappings="//@ownedViewpoints[name='UML2%20tables%20for%20tests']/@ownedRepresentations[name='Reused%20hierarchy']/@ownedLineMappings[name='Reused%20package%20lines']" domainClass="Package" semanticCandidatesExpression="aql:self.packagedElement">
+        <ownedSubLines name="Class lines" domainClass="Class" semanticCandidatesExpression="aql:self.packagedElement" headerLabelExpression=""/>
       </ownedLineMappings>
-      <ownedColumnMappings name="Name" headerLabelExpression="Name" initialWidth="200" canEdit="&lt;%isAbstract%>" featureName="name" labelExpression="&lt;%name%>"/>
-      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="&lt;%isAbstract%>"/>
+      <ownedColumnMappings name="Name" headerLabelExpression="Name" initialWidth="200" canEdit="aql:self.isAbstract" featureName="name" labelExpression="aql:self.name"/>
+      <ownedColumnMappings name="Is class abstract" headerLabelExpression="IsAbstract" featureName="isAbstract" labelExpression="aql:self.isAbstract"/>
     </ownedRepresentations>
   </ownedViewpoints>
 </description:Group>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/2077.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/2077.odesign
index 202c708a5e..36020370f4 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/2077.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/2077.odesign
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="2077" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="2077" version="10.0.0.201505222000">
   <ownedViewpoints name="2077" modelFileExtension="*.ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="2077" domainClass="EPackage">
       <defaultLayer name="Default">
-        <edgeMappings name="EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" sourceMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="&lt;%eContainer()%>" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" sourceMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="&lt;%eContainer()%>" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']">
-          <subNodeMappings name="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <containerMappings name="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']">
+          <subNodeMappings name="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
             <style xsi:type="style:SquareDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/2077/2077.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/2077/2077.odesign
index e2d338e381..d9467d6761 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/2077/2077.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/2077/2077.odesign
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="2077" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="2077" version="10.0.0.201505222000">
   <ownedViewpoints name="2077" modelFileExtension="*.ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="2077" domainClass="EPackage">
       <defaultLayer name="Default">
-        <edgeMappings name="EReference" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" sourceMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" sourceMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%name%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']">
-          <subNodeMappings name="EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
+        <containerMappings name="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2077']/@ownedRepresentations[name='2077']/@defaultLayer/@containerMappings[name='EPackage']">
+          <subNodeMappings name="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
             <style xsi:type="style:SquareDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2369/tc_breakdown.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2369/tc_breakdown.odesign
index f491b95c5e..432d83a817 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2369/tc_breakdown.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2369/tc_breakdown.odesign
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="std" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="std" version="10.0.0.201505222000">
   <ownedViewpoints name="Test Case" label="TC " modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram for Breakdown TC" label="Diagram for Breakdown TC" domainClass="EPackage">
-      <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="&lt;%eSubpackages%>" nodeMapping="//@ownedViewpoints[name='Test%20Case']/@ownedRepresentations[name='Diagram%20for%20Breakdown%20TC']/@defaultLayer/@containerMappings[name='Package%20for%20STD012']"/>
+      <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="aql:self.eSubpackages" nodeMapping="//@ownedViewpoints[name='Test%20Case']/@ownedRepresentations[name='Diagram%20for%20Breakdown%20TC']/@defaultLayer/@containerMappings[name='Package%20for%20STD012']"/>
       <defaultLayer name="Default">
         <nodeMappings name="Class for STD012" semanticCandidatesExpression="feature:eContents" domainClass="EClass">
           <style xsi:type="style:SquareDescription">
@@ -11,7 +11,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="Contain for STD012" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Test%20Case']/@ownedRepresentations[name='Diagram%20for%20Breakdown%20TC']/@defaultLayer/@containerMappings[name='Package%20for%20STD012']" targetMapping="//@ownedViewpoints[name='Test%20Case']/@ownedRepresentations[name='Diagram%20for%20Breakdown%20TC']/@defaultLayer/@containerMappings[name='Package%20for%20STD012']" targetFinderExpression="&lt;%~eSubpackages%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
+        <edgeMappings name="Contain for STD012" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Test%20Case']/@ownedRepresentations[name='Diagram%20for%20Breakdown%20TC']/@defaultLayer/@containerMappings[name='Package%20for%20STD012']" targetMapping="//@ownedViewpoints[name='Test%20Case']/@ownedRepresentations[name='Diagram%20for%20Breakdown%20TC']/@defaultLayer/@containerMappings[name='Package%20for%20STD012']" targetFinderExpression="&lt;%~eSubpackages%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
           <style sizeComputationExpression="2" routingStyle="tree" foldingStyle="TARGET">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -19,7 +19,7 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="SuperType for STD012" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Test%20Case']/@ownedRepresentations[name='Diagram%20for%20Breakdown%20TC']/@defaultLayer/@nodeMappings[name='Class%20for%20STD012']" targetMapping="//@ownedViewpoints[name='Test%20Case']/@ownedRepresentations[name='Diagram%20for%20Breakdown%20TC']/@defaultLayer/@nodeMappings[name='Class%20for%20STD012']" targetFinderExpression="&lt;%eSuperTypes%>" sourceFinderExpression="feature:eContainer" domainClass="EReference">
+        <edgeMappings name="SuperType for STD012" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Test%20Case']/@ownedRepresentations[name='Diagram%20for%20Breakdown%20TC']/@defaultLayer/@nodeMappings[name='Class%20for%20STD012']" targetMapping="//@ownedViewpoints[name='Test%20Case']/@ownedRepresentations[name='Diagram%20for%20Breakdown%20TC']/@defaultLayer/@nodeMappings[name='Class%20for%20STD012']" targetFinderExpression="aql:self.eSuperTypes" sourceFinderExpression="feature:eContainer" domainClass="EReference">
           <style sizeComputationExpression="2" routingStyle="tree">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -28,7 +28,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="Package for STD012" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2552/tc2552.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2552/tc2552.odesign
index a4d24d088e..970ef865d2 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2552/tc2552.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2552/tc2552.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="description" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="description" version="10.0.0.201505222000">
   <ownedViewpoints endUserDocumentation="2174&#xD;&#xA;" name="tc2552" label="tc2552" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc2552" label="tc2552" titleExpression="tc2552" domainClass="EPackage" enablePopupBars="true">
       <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
@@ -31,29 +31,29 @@
         <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='tc2552']/@ownedRepresentations[name='tc2552']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@borderedNodeMappings[name='EAttributeMapping2']" semanticConditionExpression="&lt;%name != &quot;activateCollapseAtt&quot;%>"/>
       </filters>
       <defaultLayer name="Default" label="default">
-        <containerMappings name="EClassContainerMapping" label="EClassMapping" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <borderedNodeMappings name="EAttributeMapping2" label="EAttributeMapping" semanticCandidatesExpression="&lt;%eAttributes%>" domainClass="EAttribute">
+        <containerMappings name="EClassContainerMapping" label="EClassMapping" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass">
+          <borderedNodeMappings name="EAttributeMapping2" label="EAttributeMapping" semanticCandidatesExpression="aql:self.eAttributes" domainClass="EAttribute">
             <style xsi:type="style:BundledImageDescription" hideLabelByDefault="true">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </borderedNodeMappings>
-          <subNodeMappings name="EOperationMapping3" label="EOperationMapping" semanticCandidatesExpression="&lt;%eOperations%>" domainClass="EOperation">
+          <subNodeMappings name="EOperationMapping3" label="EOperationMapping" semanticCandidatesExpression="aql:self.eOperations" domainClass="EOperation">
             <style xsi:type="style:BundledImageDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <subNodeMappings name="EReferenceMapping3" label="EReferenceMapping" semanticCandidatesExpression="&lt;%eReferences%>" domainClass="EReference">
+          <subNodeMappings name="EReferenceMapping3" label="EReferenceMapping" semanticCandidatesExpression="aql:self.eReferences" domainClass="EReference">
             <style xsi:type="style:BundledImageDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -109,7 +109,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2552']/@ownedRepresentations[name='Diag2399']/@defaultLayer/@nodeMappings[name='EClassNode']" targetMapping="//@ownedViewpoints[name='tc2552']/@ownedRepresentations[name='Diag2399']/@defaultLayer/@nodeMappings[name='EClassNode']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='tc2552']/@ownedRepresentations[name='Diag2399']/@defaultLayer/@nodeMappings[name='EClassNode']" targetMapping="//@ownedViewpoints[name='tc2552']/@ownedRepresentations[name='Diag2399']/@defaultLayer/@nodeMappings[name='EClassNode']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/lostelements/tc1/tc1945.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/lostelements/tc1/tc1945.odesign
index df83451a04..09d2998a09 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/lostelements/tc1/tc1945.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/lostelements/tc1/tc1945.odesign
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="10.0.0.201505222000">
   <ownedViewpoints name="Design tc1945" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities" titleExpression="&lt;%name%> package entities" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;)[!eOpposite]%>" createElements="false" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" createElements="false" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/'  else  ''  endif  +  self.name">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%derived%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.derived">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <centerLabelStyleDescription showIcon="false" labelExpression="/&lt;%getEReferenceName()%>">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -27,15 +27,15 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="&lt;%eSuperTypes%>">
-          <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan">
+        <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes">
+          <style targetArrow="InputClosedArrow" routingStyle="manhattan">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
           <conditionnalStyles predicateExpression="&lt;%$target.filter(&quot;EClass&quot;)[interface]%>">
-            <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan">
+            <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="manhattan">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               <centerLabelStyleDescription showIcon="false">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -43,45 +43,46 @@
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" createElements="false" domainClass="EClass">
+        <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass">
           <borderedNodeMappings name="EC attribute2" labelDirectEdit="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EAttribute">
-            <style xsi:type="style:LozengeNodeDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" widthComputationExpression="" heightComputationExpression="">
+            <style xsi:type="style:LozengeNodeDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " widthComputationExpression="" heightComputationExpression="">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </borderedNodeMappings>
           <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation">
-            <style xsi:type="style:BundledImageDescription" labelSize="10" tooltipExpression="&lt;%name%>(&lt;%eParameters.name.sep(&quot;, &quot;)%>) : &lt;%eType.name%>" sizeComputationExpression="2">
+            <style xsi:type="style:BundledImageDescription" labelSize="10" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='Create%20Blank%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='Design%20Package']">
-          <borderedNodeMappings name="EC EEnum 2" labelDirectEdit="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EEnum&quot;)%>" createElements="false" semanticElements="" domainClass="EEnum">
+        <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='Create%20Blank%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='Design%20Package']">
+          <borderedNodeMappings name="EC EEnum 2" labelDirectEdit="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" createElements="false" semanticElements="" domainClass="EEnum">
             <style xsi:type="style:EllipseNodeDescription">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -95,7 +96,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                 </firstModelOperations>
               </initialOperation>
             </tools>
@@ -104,7 +105,7 @@
               <viewVariable name="containerView"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="abstract" valueExpression="true"/>
                 </firstModelOperations>
               </initialOperation>
@@ -144,14 +145,14 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%extractName($0)%>"/>
-                <subModelOperations xsi:type="tool_1:If" conditionExpression="&lt;%getTypeIfWritten($0)%>">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="&lt;%getTypeIfWritten($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/>
+                <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)">
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
+          <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER">
             <oldContainer name="oldSemanticContainer"/>
             <newContainer name="newSemanticContainer"/>
             <element name="element"/>
@@ -166,9 +167,9 @@
             <mask mask="{0}"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%getReferenceNameFromString($0).trim%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="&lt;%getUpperBoundFromString($0)%>"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="&lt;%getLowerBoundFromString($0)%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -201,7 +202,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Relation">
-          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="&lt;%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']">
+          <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']">
             <initialOperation/>
             <containerViewVariable name="containerView"/>
             <representationNameVariable name="diagramName"/>
@@ -240,12 +241,12 @@
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:source"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%$source.name.toLowerCase()%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.name.toLower()"/>
                 </subModelOperations>
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
                   <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceSource">
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
-                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%$target.name.toLowerCase()%>"/>
+                    <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/>
                     <subModelOperations xsi:type="tool_1:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/>
                   </subModelOperations>
                   <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:instanceTarget">
@@ -265,7 +266,7 @@
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures">
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/>
                   <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/>
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="&lt;%true%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -275,8 +276,8 @@
             <elementView name="elementView"/>
             <containerView name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="&lt;%$elementView.sourceNode.target%>">
-                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="&lt;%$elementView.targetNode.target%>"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target">
+                <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -288,7 +289,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package">
                 <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:package">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Package &lt;%eContainer().eContents.filter(&quot;EPackage&quot;).nSize%>"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -300,7 +301,7 @@
           </ownedTools>
         </toolSections>
         <toolSections name="Dynamic">
-          <ownedTools xsi:type="tool_1:ToolDescription" name="Dynamic instance" precondition="&lt;%filter(&quot;EClass&quot;)%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
+          <ownedTools xsi:type="tool_1:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -315,7 +316,7 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/lostelements/tc2/tc1945.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/lostelements/tc2/tc1945.odesign
index 4ee4c3046c..ebcdc65b34 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/lostelements/tc2/tc1945.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/lostelements/tc2/tc1945.odesign
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Ecore Editing Workbench V4.6" version="10.0.0.201505222000">
   <ownedViewpoints name="Design tc1945" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="&lt;%name%> package entities" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
         <edgeMappings name="EC Just from A" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EClass&quot;)[name == &quot;A&quot;]%>" createElements="false" sourceMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@borderedNodeMappings[name='PortJustFromAIn']" targetMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@borderedNodeMappings[name='PortJustFromAOut']" targetFinderExpression="var:self" sourceFinderExpression="var:self" domainClass="EClass" useDomainElement="true">
-          <style>
+          <style sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription labelExpression="Just from A">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -12,7 +12,7 @@
           </style>
         </edgeMappings>
         <edgeMappings name="EC Just from B" createElements="false" sourceMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@borderedNodeMappings[name='PortJustFromAOut']" targetMapping="//@ownedViewpoints[name='Design%20tc1945']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@borderedNodeMappings[name='PortJustFromAIn']" targetFinderExpression="var:self">
-          <style lineStyle="dash">
+          <style lineStyle="dash" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription labelExpression="Just from A">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -35,13 +35,13 @@
             </style>
           </borderedNodeMappings>
           <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EOperation">
-            <style xsi:type="style:BundledImageDescription" labelSize="10" tooltipExpression="&lt;%name%>(&lt;%eParameters.name.sep(&quot;, &quot;)%>) : &lt;%eType.name%>" sizeComputationExpression="2">
+            <style xsi:type="style:BundledImageDescription" labelSize="10" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -52,7 +52,7 @@
     </ownedRepresentations>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/>
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/>
     <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/>
     <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testChangeEdgeStyle/testChangeEdgeStyle.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testChangeEdgeStyle/testChangeEdgeStyle.odesign
index 0dd5ae776d..3068e8cfcf 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testChangeEdgeStyle/testChangeEdgeStyle.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testChangeEdgeStyle/testChangeEdgeStyle.odesign
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="My" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="My" version="10.0.0.201505222000">
   <ownedViewpoints name="testD2782">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="test" domainClass="Diagram">
       <defaultLayer name="Default">
         <nodeMappings name="classNodeMapping" semanticCandidatesExpression="feature:eContents" domainClass="Node">
-          <style xsi:type="style:SquareDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="edgeMapping" sourceMapping="//@ownedViewpoints[name='testD2782']/@ownedRepresentations[name='test']/@defaultLayer/@nodeMappings[name='classNodeMapping'] //@ownedViewpoints[name='testD2782']/@ownedRepresentations[name='test']/@defaultLayer/@containerMappings[name='classContainerMapping']" targetMapping="//@ownedViewpoints[name='testD2782']/@ownedRepresentations[name='test']/@defaultLayer/@containerMappings[name='classContainerMapping'] //@ownedViewpoints[name='testD2782']/@ownedRepresentations[name='test']/@defaultLayer/@nodeMappings[name='classNodeMapping']" targetFinderExpression="&lt;%target%>" sourceFinderExpression="&lt;%source%>" domainClass="Edge" useDomainElement="true">
+        <edgeMappings name="edgeMapping" sourceMapping="//@ownedViewpoints[name='testD2782']/@ownedRepresentations[name='test']/@defaultLayer/@nodeMappings[name='classNodeMapping'] //@ownedViewpoints[name='testD2782']/@ownedRepresentations[name='test']/@defaultLayer/@containerMappings[name='classContainerMapping']" targetMapping="//@ownedViewpoints[name='testD2782']/@ownedRepresentations[name='test']/@defaultLayer/@containerMappings[name='classContainerMapping'] //@ownedViewpoints[name='testD2782']/@ownedRepresentations[name='test']/@defaultLayer/@nodeMappings[name='classNodeMapping']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="Edge" useDomainElement="true">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
-            <centerLabelStyleDescription labelExpression="&lt;%id%>">
+            <centerLabelStyleDescription labelExpression="aql:self.id">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
         <containerMappings name="classContainerMapping" semanticCandidatesExpression="feature:eContents" domainClass="Container" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%id%>">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.id">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testDeleteMapping/repairDeleteMapping.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testDeleteMapping/repairDeleteMapping.odesign
index e6d3887a69..b24e99d22b 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testDeleteMapping/repairDeleteMapping.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testDeleteMapping/repairDeleteMapping.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="My" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="My" version="10.0.0.201505222000">
   <ownedViewpoints name="repairDeleteMappingTests">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="testMappingDeleted" domainClass="migrationmodeler.Diagram">
       <filters xsi:type="filter:CompositeFilterDescription" name="nodeFilter">
@@ -10,20 +10,20 @@
       </filters>
       <defaultLayer name="Default">
         <nodeMappings name="node1" semanticCandidatesExpression="feature:eContents" domainClass="migrationmodeler.Node">
-          <borderedNodeMappings name="bordered" semanticCandidatesExpression="&lt;%eAllContents()%>" domainClass="migrationmodeler.Bordered">
-            <style xsi:type="style:LozengeNodeDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <borderedNodeMappings name="bordered" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="migrationmodeler.Bordered">
+            <style xsi:type="style:LozengeNodeDescription" labelExpression="aql:self.id" resizeKind="NSEW">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="edge" sourceMapping="//@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetMapping="//@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetFinderExpression="&lt;%target%>" sourceFinderExpression="&lt;%source%>" domainClass="migrationmodeler.Edge" useDomainElement="true">
+        <edgeMappings name="edge" sourceMapping="//@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetMapping="//@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="migrationmodeler.Edge" useDomainElement="true">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -32,7 +32,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="container1" semanticCandidatesExpression="feature:eContents" domainClass="migrationmodeler.Container">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%id%>">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.id">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -42,7 +42,7 @@
       </defaultLayer>
       <additionalLayers name="layerA">
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="containerLayerA" domainClass="migrationmodeler.Container" importedMapping="//@ownedViewpoints[name='repairDeleteMappingTests']/@ownedRepresentations[name='testMappingDeleted']/@defaultLayer/@containerMappings[name='container1']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%id%>">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.id">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testEdgeFromToEdge/edgeToFromEdgeTest.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testEdgeFromToEdge/edgeToFromEdgeTest.odesign
index 44343ce3a9..0c48476094 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testEdgeFromToEdge/edgeToFromEdgeTest.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testEdgeFromToEdge/edgeToFromEdgeTest.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="My" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="My" version="10.0.0.201505222000">
   <ownedViewpoints name="edgeToEdgeTest">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="edgeToEdge" domainClass="migrationmodeler.Diagram">
       <filters xsi:type="filter:CompositeFilterDescription" name="nodeFilter">
@@ -10,20 +10,20 @@
       </filters>
       <defaultLayer name="Default">
         <nodeMappings name="node1" semanticCandidatesExpression="feature:eContents" domainClass="migrationmodeler.Node">
-          <borderedNodeMappings name="bordered" semanticCandidatesExpression="&lt;%eAllContents()%>" domainClass="migrationmodeler.Bordered">
-            <style xsi:type="style:LozengeNodeDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <borderedNodeMappings name="bordered" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="migrationmodeler.Bordered">
+            <style xsi:type="style:LozengeNodeDescription" labelExpression="aql:self.id" resizeKind="NSEW">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="edge" sourceMapping="//@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetMapping="//@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered'] //@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@edgeMappings[name='edge']" targetFinderExpression="&lt;%target%>" sourceFinderExpression="&lt;%source%>" domainClass="migrationmodeler.Edge" useDomainElement="true">
+        <edgeMappings name="edge" sourceMapping="//@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetMapping="//@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered'] //@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@edgeMappings[name='edge']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="migrationmodeler.Edge" useDomainElement="true">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -32,7 +32,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="container1" semanticCandidatesExpression="feature:eContents" domainClass="migrationmodeler.Container">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%id%>">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.id">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -58,14 +58,14 @@
       </defaultLayer>
       <additionalLayers name="layerA">
         <nodeMappings name="nodeLayerA" semanticCandidatesExpression="feature:eContents" domainClass="migrationmodeler.Node">
-          <style xsi:type="style:SquareDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </nodeMappings>
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="containerLayerA" domainClass="migrationmodeler.Container" importedMapping="//@ownedViewpoints[name='edgeToEdgeTest']/@ownedRepresentations[name='edgeToEdge']/@defaultLayer/@containerMappings[name='container1']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%id%>">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.id">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testFilterActivated/My.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testFilterActivated/My.odesign
index c5601a01fc..ec0a77437c 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testFilterActivated/My.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testFilterActivated/My.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="My" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="My" version="10.0.0.201505222000">
   <ownedViewpoints name="testCollapse">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="testCollapse" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="collapse">
@@ -17,7 +17,7 @@
       <defaultLayer name="Default">
         <containerMappings name="package" semanticCandidatesExpression="var:self" domainClass="EPackage">
           <subContainerMappings name="class" semanticCandidatesExpression="feature:eContents" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@toolSections.0/@ownedTools[name='move%20bordered']">
-            <borderedNodeMappings name="att" semanticCandidatesExpression="&lt;%eAllContents()%>" domainClass="EAttribute">
+            <borderedNodeMappings name="att" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EAttribute">
               <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" sizeComputationExpression="1" resizeKind="NSEW" width="1" height="1">
                 <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -31,7 +31,7 @@
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               </style>
             </borderedNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -46,14 +46,14 @@
                 <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
               </style>
             </subNodeMappings>
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
             </style>
           </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -67,26 +67,26 @@
             <element name="element"/>
             <newViewContainer name="newContainerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="[newSemanticContainer/]">
-                <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="[element/]"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[newSemanticContainer/]">
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="[element/]"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createCollapse" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att']">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createCollapse" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
+                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createCollapse2" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att2']">
+          <ownedTools xsi:type="tool:NodeCreationDescription" name="createCollapse2" nodeMappings="//@ownedViewpoints[name='testCollapse']/@ownedRepresentations[name='testCollapse']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att2']">
             <variable name="container"/>
             <viewVariable name="containerView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool:CreateInstance" typeName="EOperation" referenceName="eOperations"/>
+              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
+                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EOperation" referenceName="eOperations"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testFilterDeleted/testDeleteFilter.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testFilterDeleted/testDeleteFilter.odesign
index 935c9bc81e..88c65cb078 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testFilterDeleted/testDeleteFilter.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testFilterDeleted/testDeleteFilter.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="My2" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="My2" version="10.0.0.201505222000">
   <ownedViewpoints name="repairDeleteFilterTests">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="testFilterDeleted" domainClass="migrationmodeler.Diagram">
       <filters xsi:type="filter:CompositeFilterDescription" name="nodeFilter">
@@ -7,20 +7,20 @@
       </filters>
       <defaultLayer name="Default">
         <nodeMappings name="node1" semanticCandidatesExpression="feature:eContents" domainClass="migrationmodeler.Node">
-          <borderedNodeMappings name="bordered" semanticCandidatesExpression="&lt;%eAllContents()%>" domainClass="migrationmodeler.Bordered">
-            <style xsi:type="style:LozengeNodeDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <borderedNodeMappings name="bordered" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="migrationmodeler.Bordered">
+            <style xsi:type="style:LozengeNodeDescription" labelExpression="aql:self.id" resizeKind="NSEW">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="edge" sourceMapping="//@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetMapping="//@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetFinderExpression="&lt;%target%>" sourceFinderExpression="&lt;%source%>" domainClass="migrationmodeler.Edge" useDomainElement="true">
+        <edgeMappings name="edge" sourceMapping="//@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetMapping="//@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="migrationmodeler.Edge" useDomainElement="true">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -29,7 +29,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="container1" semanticCandidatesExpression="feature:eContents" domainClass="migrationmodeler.Container">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%id%>">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.id">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -39,14 +39,14 @@
       </defaultLayer>
       <additionalLayers name="layerA">
         <nodeMappings name="nodeLayerA" semanticCandidatesExpression="feature:eContents" domainClass="migrationmodeler.Node">
-          <style xsi:type="style:SquareDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
           </style>
         </nodeMappings>
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="containerLayerA" domainClass="migrationmodeler.Container" importedMapping="//@ownedViewpoints[name='repairDeleteFilterTests']/@ownedRepresentations[name='testFilterDeleted']/@defaultLayer/@containerMappings[name='container1']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%id%>">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.id">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testLayerDeleted/repairDeleteLayer.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testLayerDeleted/repairDeleteLayer.odesign
index b1fcd9b9b6..131a56adc4 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testLayerDeleted/repairDeleteLayer.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/testLayerDeleted/repairDeleteLayer.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="My" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="My" version="10.0.0.201505222000">
   <ownedViewpoints name="repairDeleteLayerTest">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="testDeleteLayer" domainClass="migrationmodeler.Diagram">
       <filters xsi:type="filter:CompositeFilterDescription" name="nodeFilter">
@@ -10,20 +10,20 @@
       </filters>
       <defaultLayer name="Default">
         <nodeMappings name="node1" semanticCandidatesExpression="feature:eContents" domainClass="migrationmodeler.Node">
-          <borderedNodeMappings name="bordered" semanticCandidatesExpression="&lt;%eAllContents()%>" domainClass="migrationmodeler.Bordered">
-            <style xsi:type="style:LozengeNodeDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <borderedNodeMappings name="bordered" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="migrationmodeler.Bordered">
+            <style xsi:type="style:LozengeNodeDescription" labelExpression="aql:self.id" resizeKind="NSEW">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:SquareDescription" labelExpression="&lt;%id%>" resizeKind="NSEW">
+          <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="edge" sourceMapping="//@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetMapping="//@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetFinderExpression="&lt;%target%>" sourceFinderExpression="&lt;%source%>" domainClass="migrationmodeler.Edge" useDomainElement="true">
+        <edgeMappings name="edge" sourceMapping="//@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetMapping="//@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@containerMappings[name='container1'] //@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@nodeMappings[name='node1'] //@ownedViewpoints[name='repairDeleteLayerTest']/@ownedRepresentations[name='testDeleteLayer']/@defaultLayer/@nodeMappings[name='node1']/@borderedNodeMappings[name='bordered']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="migrationmodeler.Edge" useDomainElement="true">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -32,7 +32,7 @@
           </style>
         </edgeMappings>
         <containerMappings name="container1" semanticCandidatesExpression="feature:eContents" domainClass="migrationmodeler.Container">
-          <style xsi:type="style:FlatContainerStyleDescription" labelExpression="&lt;%id%>">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:self.id">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket1176/test1176.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket1176/test1176.odesign
index 66c31ebb05..e78a063c22 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket1176/test1176.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket1176/test1176.odesign
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="test_1176" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="test_1176" version="10.0.0.201505222000">
   <ownedViewpoints name="test_1176" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="test_1176_A" domainClass="EPackage">
-      <nodeMappings name="EPackage" semanticCandidatesExpression="feature:eContents" semanticElements="&lt;%self()%>" domainClass="EPackage">
+      <nodeMappings name="EPackage" semanticCandidatesExpression="feature:eContents" semanticElements="aql:self" domainClass="EPackage">
         <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW" width="5" height="5" color="//@userColorsPalettes[name=null]/@entries[name='Interpolated%20Color%201']">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -10,7 +10,7 @@
       </nodeMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="test_1176_B" domainClass="EPackage">
-      <nodeMappings name="EPackage" semanticCandidatesExpression="feature:eContents" semanticElements="&lt;%self()%>" domainClass="EPackage">
+      <nodeMappings name="EPackage" semanticCandidatesExpression="feature:eContents" semanticElements="aql:self" domainClass="EPackage">
         <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW" width="5" height="5" color="//@userColorsPalettes[name=null]/@entries[name='Interpolated%20Color%202']">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -18,7 +18,7 @@
       </nodeMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="test_1176_C" domainClass="EPackage">
-      <nodeMappings name="EPackage" semanticCandidatesExpression="feature:eContents" semanticElements="&lt;%self()%>" domainClass="EPackage">
+      <nodeMappings name="EPackage" semanticCandidatesExpression="feature:eContents" semanticElements="aql:self" domainClass="EPackage">
         <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW" width="5" height="5" color="//@userColorsPalettes[name=null]/@entries[name='Interpolated%20Color%203']">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -26,7 +26,7 @@
       </nodeMappings>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="test_1176_D" domainClass="EPackage">
-      <nodeMappings name="EPackage" semanticCandidatesExpression="feature:eContents" semanticElements="&lt;%self()%>" domainClass="EPackage">
+      <nodeMappings name="EPackage" semanticCandidatesExpression="feature:eContents" semanticElements="aql:self" domainClass="EPackage">
         <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW" width="5" height="5" color="//@userColorsPalettes[name=null]/@entries[name='Interpolated%20Color%204']">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -35,7 +35,7 @@
     </ownedRepresentations>
   </ownedViewpoints>
   <userColorsPalettes>
-    <entries xsi:type="description:InterpolatedColor" name="Interpolated Color 1" colorValueComputationExpression="&lt;%eContents().nSize()%>">
+    <entries xsi:type="description:InterpolatedColor" name="Interpolated Color 1" colorValueComputationExpression="aql:self.eContents()->size()">
       <colorSteps>
         <associatedColor href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
       </colorSteps>
@@ -52,10 +52,10 @@
       <colorSteps>
         <associatedColor href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
       </colorSteps>
-      <colorSteps associatedValue="&lt;%1%>" associatedColor="//@userColorsPalettes[name=null]/@entries[name='bleu']"/>
+      <colorSteps associatedValue="1" associatedColor="//@userColorsPalettes[name=null]/@entries[name='bleu']"/>
       <colorSteps associatedValue="&lt;%10%>" associatedColor="//@userColorsPalettes[name=null]/@entries[name='rose']"/>
     </entries>
-    <entries xsi:type="description:InterpolatedColor" name="Interpolated Color 2" colorValueComputationExpression="&lt;%eContents().nSize()%>">
+    <entries xsi:type="description:InterpolatedColor" name="Interpolated Color 2" colorValueComputationExpression="aql:self.eContents()->size()">
       <colorSteps>
         <associatedColor href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
       </colorSteps>
@@ -79,7 +79,7 @@
         <associatedColor href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
       </colorSteps>
     </entries>
-    <entries xsi:type="description:InterpolatedColor" name="Interpolated Color 3" colorValueComputationExpression="&lt;%eContents().nSize()%>">
+    <entries xsi:type="description:InterpolatedColor" name="Interpolated Color 3" colorValueComputationExpression="aql:self.eContents()->size()">
       <colorSteps>
         <associatedColor href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
       </colorSteps>
@@ -93,7 +93,7 @@
         <associatedColor href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
       </colorSteps>
     </entries>
-    <entries xsi:type="description:InterpolatedColor" name="Interpolated Color 4" colorValueComputationExpression="&lt;%eContents().nSize()%>"/>
+    <entries xsi:type="description:InterpolatedColor" name="Interpolated Color 4" colorValueComputationExpression="aql:self.eContents()->size()"/>
     <entries xsi:type="description:UserFixedColor" red="0" green="128" blue="255" name="bleu"/>
     <entries xsi:type="description:UserFixedColor" red="255" green="255" blue="0" name="jaune"/>
     <entries xsi:type="description:UserFixedColor" red="255" green="128" blue="255" name="rose"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.odesign
index c52f3e841b..b64cfb24ec 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.odesign
@@ -1,107 +1,107 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="tc2229" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="tc2229" version="10.0.0.201505222000">
   <ownedViewpoints name="tc2229" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc2229" label="tc2229" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="ClassMapping Square" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:SquareDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Square_&lt;%name%>" resizeKind="NSEW" width="20" height="20">
+        <nodeMappings name="ClassMapping Square" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:SquareDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="aql:'Square_' + self.name" resizeKind="NSEW" width="20" height="20">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Lozenge" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Lozenge_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
+        <nodeMappings name="ClassMapping Lozenge" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Lozenge_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Ellipse" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Ellipse_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
+        <nodeMappings name="ClassMapping Ellipse" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Ellipse_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Bundled Image Square" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Bundle_Image_Square_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
+        <nodeMappings name="ClassMapping Bundled Image Square" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Bundle_Image_Square_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Bundled Image Stroke" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Bundle_Image_Stroke_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="stroke">
+        <nodeMappings name="ClassMapping Bundled Image Stroke" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Bundle_Image_Stroke_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="stroke">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Bundled Image Triangle" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Bundle_Image_Triangle_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="triangle">
+        <nodeMappings name="ClassMapping Bundled Image Triangle" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Bundle_Image_Triangle_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="triangle">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Bundled Image Dot" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Bundle_Image_Dot_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="dot">
+        <nodeMappings name="ClassMapping Bundled Image Dot" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Bundle_Image_Dot_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="dot">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Bundled Image Ring" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Bundle_Image_Ring_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="ring">
+        <nodeMappings name="ClassMapping Bundled Image Ring" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Bundle_Image_Ring_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="ring">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Note" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:NoteDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Note_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
+        <nodeMappings name="ClassMapping Note" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:NoteDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Note_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Dot" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:DotDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Dot_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" strokeSizeComputationExpression="5">
+        <nodeMappings name="ClassMapping Dot" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:DotDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Dot_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" strokeSizeComputationExpression="5">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Gauge" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Gauge_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
+        <nodeMappings name="ClassMapping Gauge" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Gauge_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Workspace Image" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Workspace_Image_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" workspacePath="/2229/logo_o.png">
+        <nodeMappings name="ClassMapping Workspace Image" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Workspace_Image_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/2229/logo_o.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <containerMappings name="EC EClass Flat Container" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Flat_Container_&lt;%name%>" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="EC EClass Flat Container" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="aql:'Flat_Container_' + self.name" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EC EClass Shape Container" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:ShapeContainerStyleDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Shape_Container_&lt;%name%>" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>">
+        <containerMappings name="EC EClass Shape Container" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="aql:'Shape_Container_' + self.name" tooltipExpression="aql:self.eContainer().name + '.' + self.name">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EC EClass Workspace Image Container" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Workspace_Image_Container_&lt;%name%>" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" workspacePath="/2229/logo_o.png">
+        <containerMappings name="EC EClass Workspace Image Container" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Workspace_Image_Container_&lt;%name%>" tooltipExpression="aql:self.eContainer().name + '.' + self.name" arcWidth="1" arcHeight="1" workspacePath="/2229/logo_o.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -112,7 +112,7 @@
             <viewVariable name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass &lt;%eContainer().eContents().filter(&quot;EClass&quot;).nSize%>"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2230/2230.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2230/2230.odesign
index a11353120b..0392215005 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2230/2230.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2230/2230.odesign
@@ -1,56 +1,59 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="2230" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="2230" version="10.0.0.201505222000">
   <ownedViewpoints name="2230" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="&lt;%name%> package entities" domainClass="EPackage" enablePopupBars="true">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <edgeMappings name="EC_EReference" preconditionExpression="&lt;%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="1">
+        <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+            <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
           <conditionnalStyles predicateExpression="&lt;%containment &amp;&amp; derived%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-              <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
+                <labelFormat>italic</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
           <conditionnalStyles predicateExpression="&lt;%!containment &amp;&amp; derived%>">
-            <style sizeComputationExpression="1">
+            <style>
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-              <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
+                <labelFormat>italic</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
-          <conditionnalStyles predicateExpression="&lt;%containment%>">
-            <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+          <conditionnalStyles predicateExpression="aql:self.containment">
+            <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <centerLabelStyleDescription showIcon="false" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%getEReferenceName()%>">
+              <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               </centerLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappings>
-        <containerMappings name="EC EClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
+        <containerMappings name="EC EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
           <subNodeMappings name="EC EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute">
-            <style xsi:type="style:BundledImageDescription" labelExpression="&lt;%if (derived) {%>/&lt;%}%>&lt;%name%> : &lt;%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1">
+            <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/'  else  ''  endif  + self.name + ' : ' + self.eType.name " labelAlignment="LEFT" sizeComputationExpression="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" labelColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='computedColor']" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='computedColor']" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
-          <conditionnalStyles predicateExpression="&lt;%abstract%>">
-            <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <conditionnalStyles predicateExpression="aql:self.abstract">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
               <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -59,8 +62,8 @@
         </containerMappings>
       </defaultLayer>
       <additionalLayers name="Package" activeByDefault="true">
-        <containerMappings name="Design Package" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+        <containerMappings name="Design Package" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
@@ -68,7 +71,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Dropped Package" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']">
-          <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
@@ -80,7 +83,7 @@
     <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/>
   </ownedViewpoints>
   <userColorsPalettes name="Ecore Palette">
-    <entries xsi:type="description:InterpolatedColor" name="Size Based Color">
+    <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]">
       <colorSteps>
         <associatedColor href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
       </colorSteps>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2262/tc2262.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2262/tc2262.odesign
index 81b0aea6be..d8ea3ff50a 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2262/tc2262.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2262/tc2262.odesign
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="description" version="10.0.0.201411061000">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="description" version="10.0.0.201505222000">
   <ownedViewpoints name="bug.test" label="TC2262" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc2262" label="tc2262" domainClass="EPackage" enablePopupBars="true">
       <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
       <defaultLayer name="Default" label="default">
-        <nodeMappings name="EAttributeMapping" label="EAttributeMapping" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EAttribute&quot;)%>" domainClass="EAttribute">
-          <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+        <nodeMappings name="EAttributeMapping" label="EAttributeMapping" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EAttribute)" domainClass="EAttribute">
+          <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EOperationMapping" label="EOperationMapping" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EOperation&quot;)%>" domainClass="EOperation">
-          <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+        <nodeMappings name="EOperationMapping" label="EOperationMapping" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EOperation)" domainClass="EOperation">
+          <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EReferenceMapping" label="EReferenceMapping" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EReference&quot;)%>" domainClass="EReference">
-          <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="&lt;%-1%>" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+        <nodeMappings name="EReferenceMapping" label="EReferenceMapping" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EReference)" domainClass="EReference">
+          <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="EClassNodeMapping" label="EClassMapping" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;)%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EAttributeMapping'] //@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EOperationMapping'] //@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EReferenceMapping']">
+        <nodeMappings name="EClassNodeMapping" label="EClassMapping" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EAttributeMapping'] //@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EOperationMapping'] //@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EReferenceMapping']">
           <style xsi:type="style:SquareDescription" sizeComputationExpression="6">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -30,75 +30,75 @@
           </style>
         </nodeMappings>
         <nodeMappings name="EPackageMapping" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-          <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" resizeKind="NSEW">
+          <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" resizeKind="NSEW" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <containerMappings name="EClassContainerMapping" label="EClassMapping" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <borderedNodeMappings name="EAttributeMapping2" label="EAttributeMapping" semanticCandidatesExpression="&lt;%eAttributes%>" domainClass="EAttribute">
-            <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+        <containerMappings name="EClassContainerMapping" label="EClassMapping" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass">
+          <borderedNodeMappings name="EAttributeMapping2" label="EAttributeMapping" semanticCandidatesExpression="aql:self.eAttributes" domainClass="EAttribute">
+            <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </borderedNodeMappings>
-          <borderedNodeMappings name="EOperationMapping2" label="EOperationMapping" semanticCandidatesExpression="&lt;%eOperations%>" domainClass="EOperation">
-            <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+          <borderedNodeMappings name="EOperationMapping2" label="EOperationMapping" semanticCandidatesExpression="aql:self.eOperations" domainClass="EOperation">
+            <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </borderedNodeMappings>
-          <borderedNodeMappings name="EReferenceMapping2" label="EReferenceMapping" semanticCandidatesExpression="&lt;%eReferences%>" domainClass="EReference">
-            <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="&lt;%-1%>" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+          <borderedNodeMappings name="EReferenceMapping2" label="EReferenceMapping" semanticCandidatesExpression="aql:self.eReferences" domainClass="EReference">
+            <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </borderedNodeMappings>
-          <subNodeMappings name="EAttributeMapping3" label="EAttributeMapping" semanticCandidatesExpression="&lt;%eAttributes%>" domainClass="EAttribute">
-            <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+          <subNodeMappings name="EAttributeMapping3" label="EAttributeMapping" semanticCandidatesExpression="aql:self.eAttributes" domainClass="EAttribute">
+            <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <subNodeMappings name="EOperationMapping3" label="EOperationMapping" semanticCandidatesExpression="&lt;%eOperations%>" domainClass="EOperation">
-            <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+          <subNodeMappings name="EOperationMapping3" label="EOperationMapping" semanticCandidatesExpression="aql:self.eOperations" domainClass="EOperation">
+            <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <subNodeMappings name="EReferenceMapping3" label="EReferenceMapping" semanticCandidatesExpression="&lt;%eReferences%>" domainClass="EReference">
-            <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="&lt;%-1%>" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
+          <subNodeMappings name="EReferenceMapping3" label="EReferenceMapping" semanticCandidatesExpression="aql:self.eReferences" domainClass="EReference">
+            <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EClassContainerMapping_img" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:WorkspaceImageDescription" labelExpression="container_image" sizeComputationExpression="-1" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.junit/images/UseCase.png">
+        <containerMappings name="EClassContainerMapping_img" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:WorkspaceImageDescription" labelExpression="container_image" sizeComputationExpression="-1" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/UseCase.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EClassContainerMapping_list_img" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:WorkspaceImageDescription" labelExpression="list_image" sizeComputationExpression="-1" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.junit/images/UseCase.png">
+        <containerMappings name="EClassContainerMapping_list_img" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:WorkspaceImageDescription" labelExpression="list_image" sizeComputationExpression="-1" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/UseCase.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EClassContainerMapping_img_not_found" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:WorkspaceImageDescription" labelExpression="container_image_not_found" sizeComputationExpression="-1" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.junit/images/nonexistingimage.png">
+        <containerMappings name="EClassContainerMapping_img_not_found" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:WorkspaceImageDescription" labelExpression="container_image_not_found" sizeComputationExpression="-1" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/nonexistingimage.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </containerMappings>
-        <containerMappings name="EClassContainerMapping_list_img_not_found" semanticCandidatesExpression="&lt;%eClassifiers.filter(&quot;EClass&quot;)%>" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:WorkspaceImageDescription" labelExpression="list_image_not_found" sizeComputationExpression="-1" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.junit/nonexistingimage.png">
+        <containerMappings name="EClassContainerMapping_list_img_not_found" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:WorkspaceImageDescription" labelExpression="list_image_not_found" sizeComputationExpression="-1" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/nonexistingimage.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticketvp1718/tc1718.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticketvp1718/tc1718.odesign
index ee26772038..4c7270b804 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticketvp1718/tc1718.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticketvp1718/tc1718.odesign
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="10.0.0.201505222000">
   <ownedViewpoints name="vp-1718" modelFileExtension="*.ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diagramDescription" domainClass="EPackage">
-      <edgeMappings name="Reference" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='vp-1718']/@ownedRepresentations[name='diagramDescription']/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1718']/@ownedRepresentations[name='diagramDescription']/@containerMappings[name='Class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+      <edgeMappings name="Reference" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='vp-1718']/@ownedRepresentations[name='diagramDescription']/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1718']/@ownedRepresentations[name='diagramDescription']/@containerMappings[name='Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
         <style sizeComputationExpression="2">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <centerLabelStyleDescription showIcon="false">
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </centerLabelStyleDescription>
         </style>
-        <conditionnalStyles predicateExpression="&lt;%containment%>">
-          <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1">
+        <conditionnalStyles predicateExpression="aql:self.containment">
+          <style sourceArrow="FillDiamond" targetArrow="NoDecoration">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription showIcon="false">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -18,7 +18,7 @@
           </style>
         </conditionnalStyles>
       </edgeMappings>
-      <edgeMappings name="SuperTypeReference" sourceMapping="//@ownedViewpoints[name='vp-1718']/@ownedRepresentations[name='diagramDescription']/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1718']/@ownedRepresentations[name='diagramDescription']/@containerMappings[name='Class']" targetFinderExpression="&lt;%eSuperTypes%>">
+      <edgeMappings name="SuperTypeReference" sourceMapping="//@ownedViewpoints[name='vp-1718']/@ownedRepresentations[name='diagramDescription']/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1718']/@ownedRepresentations[name='diagramDescription']/@containerMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes">
         <style targetArrow="InputClosedArrow" sizeComputationExpression="2">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <centerLabelStyleDescription showIcon="false">
@@ -34,15 +34,16 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="Liquid">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="Liquid">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
         </style>
-        <conditionnalStyles predicateExpression="&lt;%abstract%>">
-          <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="&lt;%name%>" backgroundStyle="GradientTopToBottom">
+        <conditionnalStyles predicateExpression="aql:self.abstract">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+            <labelFormat>italic</labelFormat>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-1879/VP-1879.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-1879/VP-1879.odesign
index 0eb41965e6..394bdc111c 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-1879/VP-1879.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-1879/VP-1879.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="VP-1879" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="VP-1879" version="10.0.0.201505222000">
   <ownedViewpoints name="VP-1879" modelFileExtension="*.ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="vp1879" domainClass="EPackage">
       <defaultLayer name="Default">
@@ -11,14 +11,14 @@
           </style>
         </nodeMappings>
         <edgeMappings name="edge_ref" sourceMapping="//@ownedViewpoints[name='VP-1879']/@ownedRepresentations[name='vp1879']/@defaultLayer/@nodeMappings[name='node_class']" targetMapping="//@ownedViewpoints[name='VP-1879']/@ownedRepresentations[name='vp1879']/@defaultLayer/@nodeMappings[name='node_class']" targetFinderExpression="[self.eReferenceType/]" sourceFinderExpression="[self.eContainer()/]" domainClass="EReference" useDomainElement="true">
-          <style sizeComputationExpression="&lt;%name%>">
+          <style sizeComputationExpression="aql:self.name">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
             <centerLabelStyleDescription labelExpression="[self.name/]">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <edgeMappings name="edge_ref_without_size_expr" semanticCandidatesExpression="&lt;%eAllContents(&quot;EReference&quot;).nFirst%>" sourceMapping="//@ownedViewpoints[name='VP-1879']/@ownedRepresentations[name='vp1879']/@defaultLayer/@nodeMappings[name='node_class']" targetMapping="//@ownedViewpoints[name='VP-1879']/@ownedRepresentations[name='vp1879']/@defaultLayer/@nodeMappings[name='node_class']" targetFinderExpression="&lt;%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <edgeMappings name="edge_ref_without_size_expr" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->first()" sourceMapping="//@ownedViewpoints[name='VP-1879']/@ownedRepresentations[name='vp1879']/@defaultLayer/@nodeMappings[name='node_class']" targetMapping="//@ownedViewpoints[name='VP-1879']/@ownedRepresentations[name='vp1879']/@defaultLayer/@nodeMappings[name='node_class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
           <style sizeComputationExpression="">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription labelExpression="empty size expr">
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-3790/VP-3790.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-3790/VP-3790.odesign
index 030a5a3ed1..3fcfd79b1b 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-3790/VP-3790.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-3790/VP-3790.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-3790" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-3790" version="10.0.0.201505222000">
   <ownedViewpoints name="VP-3790">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3790" domainClass="EPackage">
       <defaultLayer name="Default">
@@ -50,14 +50,14 @@
           </conditionnalStyles>
         </edgeMappings>
         <containerMappings name="package" semanticCandidatesExpression="var:self" domainClass="EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
           <conditionnalStyles predicateExpression="&lt;%name == &quot;force base style&quot;%>">
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -72,7 +72,7 @@
             <containerView name="containerView"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[element/]">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="&lt;%name%>_d"/>
+                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.name + '_d'"/>
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
@@ -136,14 +136,14 @@
           </conditionnalStyles>
         </edgeMappingImports>
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="p_import_1" semanticCandidatesExpression="var:self" importedMapping="//@ownedViewpoints[name='VP-3790']/@ownedRepresentations[name='VP-3790']/@defaultLayer/@containerMappings[name='package']">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/>
           </style>
           <conditionnalStyles predicateExpression="&lt;%name == &quot;force level 1 style&quot;%>">
-            <style xsi:type="style:FlatContainerStyleDescription">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -187,7 +187,7 @@
           </conditionnalStyles>
         </edgeMappingImports>
         <containerMappings xsi:type="description_1:ContainerMappingImport" name="p_import_2" semanticCandidatesExpression="var:self" importedMapping="//@ownedViewpoints[name='VP-3790']/@ownedRepresentations[name='VP-3790']/@additionalLayers[name='Level%201%20%3A%20red']/@containerMappings[name='p_import_1']">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp973/vp973.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp973/vp973.odesign
index f376cea0a4..8e7d3f5463 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp973/vp973.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp973/vp973.odesign
@@ -1,99 +1,99 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="vp973" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="vp973" version="10.0.0.201505222000">
   <ownedViewpoints name="vp973" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="vp973" label="vp973" domainClass="EPackage" enablePopupBars="true">
       <defaultLayer name="Default">
-        <nodeMappings name="ClassMapping Square" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:SquareDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Square_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" width="20" height="20">
+        <nodeMappings name="ClassMapping Square" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:SquareDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="aql:'Square_' + self.name" sizeComputationExpression="20" resizeKind="NSEW" width="20" height="20">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Lozenge" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Lozenge_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
+        <nodeMappings name="ClassMapping Lozenge" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:LozengeNodeDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Lozenge_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Ellipse" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Ellipse_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
+        <nodeMappings name="ClassMapping Ellipse" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Ellipse_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Bundled Image Square" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Bundle_Image_Square_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
+        <nodeMappings name="ClassMapping Bundled Image Square" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Bundle_Image_Square_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Bundled Image Stroke" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Bundle_Image_Stroke_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="stroke">
+        <nodeMappings name="ClassMapping Bundled Image Stroke" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Bundle_Image_Stroke_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="stroke">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Bundled Image Triangle" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Bundle_Image_Triangle_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="triangle">
+        <nodeMappings name="ClassMapping Bundled Image Triangle" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Bundle_Image_Triangle_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="triangle">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Bundled Image Dot" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Bundle_Image_Dot_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="dot">
+        <nodeMappings name="ClassMapping Bundled Image Dot" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Bundle_Image_Dot_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="dot">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Bundled Image Ring" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Bundle_Image_Ring_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="ring">
+        <nodeMappings name="ClassMapping Bundled Image Ring" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:BundledImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Bundle_Image_Ring_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" shape="ring">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Note" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:NoteDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Note_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
+        <nodeMappings name="ClassMapping Note" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:NoteDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Note_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Dot" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:DotDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Dot_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" strokeSizeComputationExpression="1">
+        <nodeMappings name="ClassMapping Dot" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:DotDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Dot_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" strokeSizeComputationExpression="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Gauge" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Gauge_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
+        <nodeMappings name="ClassMapping Gauge" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:GaugeCompositeStyleDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Gauge_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="ClassMapping Workspace Image" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" domainClass="EClass">
-          <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Workspace_Image_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png">
+        <nodeMappings name="ClassMapping Workspace Image" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass">
+          <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Workspace_Image_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </nodeMappings>
         <nodeMappings name="Package" semanticCandidatesExpression="var:self" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']">
-          <style xsi:type="style:SquareDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Square_&lt;%name%>" sizeComputationExpression="20" resizeKind="NSEW" width="20" height="20">
+          <style xsi:type="style:SquareDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="aql:'Square_' + self.name" sizeComputationExpression="20" resizeKind="NSEW" width="20" height="20">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
           </style>
         </nodeMappings>
         <containerMappings name="Package" semanticCandidatesExpression="var:self" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='Package']">
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Flat_Container_&lt;%name%>" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="aql:'Flat_Container_' + self.name" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
@@ -101,7 +101,7 @@
           </style>
         </containerMappings>
         <containerMappings name="Package2" semanticCandidatesExpression="var:self" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot'] //@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='Package']">
-          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="&lt;%eContainer().eContents().nSize()%>" labelExpression="Flat_Container_&lt;%name%>" tooltipExpression="&lt;%eContainer.name%>.&lt;%name%>" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="aql:'Flat_Container_' + self.name" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/ticket1843/ticket1843.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/ticket1843/ticket1843.odesign
index b17f1c07cb..19804f61ca 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/ticket1843/ticket1843.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/ticket1843/ticket1843.odesign
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="ticket1843" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="ticket1843" version="10.0.0.201505222000">
   <ownedViewpoints name="Ticket_1843" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Fixture" domainClass="EPackage">
       <defaultLayer name="Default">
-        <edgeMappings name="EM_AssociationClass" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EClass&quot;)%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_DataType']" targetMapping="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_DataType']" targetFinderExpression="&lt;%eAllAttributes[name == &quot;target&quot;].eType%>" sourceFinderExpression="&lt;%eAllAttributes[name == &quot;source&quot;].eType%>" domainClass="EClass" useDomainElement="true">
-          <style sizeComputationExpression="&lt;%1%>">
+        <edgeMappings name="EM_AssociationClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_DataType']" targetMapping="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_DataType']" targetFinderExpression="&lt;%eAllAttributes[name == &quot;target&quot;].eType%>" sourceFinderExpression="&lt;%eAllAttributes[name == &quot;source&quot;].eType%>" domainClass="EClass" useDomainElement="true">
+          <style>
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="CM_EPackage" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@containerMappings[name='CM_EPackage']">
-          <borderedNodeMappings name="BN_DataType" semanticCandidatesExpression="&lt;%eContents.filter(&quot;EDataType&quot;)%>" domainClass="EDataType">
+        <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@containerMappings[name='CM_EPackage']">
+          <borderedNodeMappings name="BN_DataType" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)" domainClass="EDataType">
             <style xsi:type="style:BundledImageDescription" sizeComputationExpression="2">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/VP-3834/VP-3834.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/VP-3834/VP-3834.odesign
index 072ce6dd47..537b830b39 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/VP-3834/VP-3834.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/VP-3834/VP-3834.odesign
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VP-3834" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VP-3834" version="10.0.0.201505222000">
   <ownedViewpoints name="VP-3834_Viewpoint" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3834_Diagram" initialisation="true" domainClass="EPackage" preconditionExpression="&lt;%eContainer == null%>">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3834_Diagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.eContainer() == null">
       <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
       <defaultLayer name="Default">
         <nodeMappings name="EClassMapping" semanticCandidatesExpression="[eClassifiers/]" domainClass="ecore.EClass">
@@ -19,8 +19,8 @@
             </centerLabelStyleDescription>
           </style>
         </edgeMappings>
-        <containerMappings name="EPackageMapping" preconditionExpression="&lt;%eContainer != null%>" semanticCandidatesExpression="[eSubpackages/]" createElements="false" domainClass="ecore.EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@nodeMappings[name='EClassMapping']" reusedContainerMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']">
-          <style xsi:type="style:FlatContainerStyleDescription">
+        <containerMappings name="EPackageMapping" preconditionExpression="aql:self.eContainer &lt;> null" semanticCandidatesExpression="[eSubpackages/]" createElements="false" domainClass="ecore.EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@nodeMappings[name='EClassMapping']" reusedContainerMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -111,8 +111,8 @@
             </style>
           </conditionnalStyles>
         </edgeMappingImports>
-        <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingBis" preconditionExpression="&lt;%eContainer != null %>" domainClass="ecore.EPackage" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']">
-          <style xsi:type="style:ShapeContainerStyleDescription">
+        <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingBis" preconditionExpression="aql:self.eContainer() &lt;> null" domainClass="ecore.EPackage" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']">
+          <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
@@ -133,20 +133,26 @@
           <conditionnalStyles predicateExpression="[true/]">
             <style xsi:type="style:BracketEdgeStyleDescription" sizeComputationExpression="2">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-              <beginLabelStyleDescription labelFormat="bold_italic" labelExpression="[name/]">
+              <beginLabelStyleDescription labelExpression="[name/]">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               </beginLabelStyleDescription>
-              <centerLabelStyleDescription labelFormat="bold_italic" labelExpression="[name/]">
+              <centerLabelStyleDescription labelExpression="[name/]">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               </centerLabelStyleDescription>
-              <endLabelStyleDescription labelFormat="bold_italic" labelExpression="[name/]">
+              <endLabelStyleDescription labelExpression="[name/]">
+                <labelFormat>italic</labelFormat>
+                <labelFormat>bold</labelFormat>
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
               </endLabelStyleDescription>
             </style>
           </conditionnalStyles>
         </edgeMappingImports>
-        <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingTer" preconditionExpression="&lt;%eContainer != null %>" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@additionalLayers[name='L1']/@containerMappings[name='EPackageMappingBis']">
-          <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius/modeling32.png">
+        <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingTer" preconditionExpression="aql:self.eContainer() &lt;> null" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@additionalLayers[name='L1']/@containerMappings[name='EPackageMappingBis']">
+          <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius/modeling32.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -174,7 +180,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingImportOfL3" preconditionExpression="&lt;%eContainer != null %>" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentationExtensions[name='VP-3834_DiagramExtension']/@layers[name='L2']/@containerMappings[name='EPackageMappingTer']">
+        <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingImportOfL3" preconditionExpression="aql:self.eContainer() &lt;> null" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentationExtensions[name='VP-3834_DiagramExtension']/@layers[name='L2']/@containerMappings[name='EPackageMappingTer']">
           <borderedNodeMappings name="EClassBorderedNodeMappingOfL3" semanticCandidatesExpression="[eClassifiers/]" domainClass="ecore.EClass">
             <borderedNodeMappings name="EAttributeSubBorderedNodeMappingOfL3" semanticCandidatesExpression="[eAttributes/]" domainClass="ecore.EAttribute">
               <style xsi:type="style:SquareDescription" resizeKind="NSEW">
@@ -196,7 +202,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             </style>
           </borderedNodeMappings>
-          <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius/modeling32.png">
+          <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius/modeling32.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -282,8 +288,8 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingImportOfL4" preconditionExpression="&lt;%eContainer != null %>" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentationExtensions[name='VP-3834_DiagramExtension']/@layers[name='L3']/@containerMappings[name='EPackageMappingImportOfL3']">
-          <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius/modeling32.png">
+        <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingImportOfL4" preconditionExpression="aql:self.eContainer() &lt;> null" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentationExtensions[name='VP-3834_DiagramExtension']/@layers[name='L3']/@containerMappings[name='EPackageMappingImportOfL3']">
+          <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius/modeling32.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -297,8 +303,8 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingImportOfL5" preconditionExpression="&lt;%eContainer != null %>" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentationExtensions[name='VP-3834_DiagramExtension']/@layers[name='L4']/@containerMappings[name='EPackageMappingImportOfL4']">
-          <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius/modeling32.png">
+        <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingImportOfL5" preconditionExpression="aql:self.eContainer() &lt;> null" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentationExtensions[name='VP-3834_DiagramExtension']/@layers[name='L4']/@containerMappings[name='EPackageMappingImportOfL4']">
+          <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius/modeling32.png">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/applicability/applicability_extension.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/applicability/applicability_extension.odesign
index 757dabd036..ad46d2f34a 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/applicability/applicability_extension.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/applicability/applicability_extension.odesign
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="ToolsApplicability extension" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="ToolsApplicability extension" version="10.0.0.201505222000">
   <ownedViewpoints name="Documentation" label="Documentation">
     <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.tests.junit/Design" representationName="Entities">
       <layers name="Documentation">
         <nodeMappings name="EC Doc Annotation" labelDirectEdit="//@ownedViewpoints[name='Documentation']/@ownedRepresentationExtensions[name='Entities']/@layers[name='Documentation']/@toolSections.0/@ownedTools[name='Edit%20Detail']" semanticCandidatesExpression="&lt;%(eClassifiers.eAnnotations+ eAnnotations).details.filter(&quot;EStringToStringMapEntry&quot;)[key == &quot;documentation&quot;]%>" domainClass="EStringToStringMapEntry">
-          <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="&lt;%value%>" sizeComputationExpression="5" labelPosition="node" resizeKind="NSEW">
+          <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="aql:self.value" sizeComputationExpression="5" labelPosition="node" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-3600.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-3600.odesign
index f4fe447cc8..8935db53b8 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-3600.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-3600.odesign
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="10.0.0.201505222000">
   <ownedViewpoints name="Doremi-2847">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="BlankDiagram" domainClass="EPackage">
       <defaultLayer name="Default">
-        <edgeMappings name="superType" sourceMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetFinderExpression="&lt;%self.eSuperTypes%>">
+        <edgeMappings name="superType" sourceMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -26,7 +26,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -63,7 +63,7 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%target%>"/>
+              <firstModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:self.target"/>
             </initialOperation>
           </ownedTools>
         </toolSections>
@@ -102,7 +102,7 @@
       </additionalLayers>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="BlankDiagramWithoutLayer" domainClass="EPackage">
-      <edgeMappings name="superType" sourceMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetFinderExpression="&lt;%self.eSuperTypes%>">
+      <edgeMappings name="superType" sourceMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes">
         <style sizeComputationExpression="2">
           <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           <centerLabelStyleDescription>
@@ -125,7 +125,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -162,14 +162,14 @@
           <sourceViewVariable name="sourceView"/>
           <targetViewVariable name="targetView"/>
           <initialOperation>
-            <firstModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%target%>"/>
+            <firstModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:self.target"/>
           </initialOperation>
         </ownedTools>
       </toolSection>
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="BlankDiagramWithToolGroups" domainClass="EPackage">
       <defaultLayer name="Default">
-        <edgeMappings name="superType" sourceMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetFinderExpression="&lt;%self.eSuperTypes%>">
+        <edgeMappings name="superType" sourceMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
             <centerLabelStyleDescription>
@@ -192,7 +192,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -231,7 +231,7 @@
             <sourceViewVariable name="sourceView"/>
             <targetViewVariable name="targetView"/>
             <initialOperation>
-              <firstModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="&lt;%target%>"/>
+              <firstModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:self.target"/>
             </initialOperation>
           </ownedTools>
         </toolSections>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-4519.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-4519.odesign
index 45cd598cf5..7783642dcb 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-4519.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-4519.odesign
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="My" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="My" version="10.0.0.201505222000">
   <ownedViewpoints name="bug_root" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="rep0" initialisation="true" domainClass="EPackage">
       <defaultLayer name="Default">
         <containerMappings name="package" semanticCandidatesExpression="feature:eContents" synchronizationLock="true" domainClass="EPackage" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
         </containerMappings>
-        <containerMappings name="class" preconditionExpression="&lt;%true%>" createElements="false" domainClass="EClass" childrenPresentation="List">
-          <style xsi:type="style:FlatContainerStyleDescription">
+        <containerMappings name="class" preconditionExpression="aql:true" createElements="false" domainClass="EClass" childrenPresentation="List">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolFilters.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolFilters.odesign
index f81999b357..390fff8a11 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolFilters.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/toolFilters.odesign
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" version="10.0.0.201505222000">
   <ownedViewpoints name="toolFilters" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="toolFiltersLayers" domainClass="EPackage">
       <defaultLayer name="L1">
         <toolSections name="section1">
           <ownedTools xsi:type="tool:ToolDescription" documentation="always hidden" name="tool1">
-            <filters precondition="&lt;%true%>" elementsToListen="&lt;%">
+            <filters precondition="aql:true" elementsToListen="&lt;%">
               <listeners domainClass="EObject" featureName=""/>
             </filters>
             <element name="element"/>
@@ -13,7 +13,7 @@
             <initialOperation/>
           </ownedTools>
           <ownedTools xsi:type="tool:ToolDescription" documentation="always visible" name="tool2">
-            <filters precondition="&lt;%false%>">
+            <filters precondition="aql:false">
               <listeners domainClass="EObject" featureName="eContainer"/>
             </filters>
             <element name="element"/>
@@ -26,7 +26,7 @@
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="toolFiltersWithoutLayers" domainClass="EPackage">
       <toolSection name="section0">
         <ownedTools xsi:type="tool:ToolDescription" documentation="always hidden" name="tool1">
-          <filters precondition="&lt;%true%>" elementsToListen="&lt;%%>">
+          <filters precondition="aql:true" elementsToListen="&lt;%%>">
             <listeners domainClass="EObject" featureName="eContainer"/>
           </filters>
           <element name="element"/>
@@ -34,7 +34,7 @@
           <initialOperation/>
         </ownedTools>
         <ownedTools xsi:type="tool:ToolDescription" documentation="always visible" name="tool2">
-          <filters precondition="&lt;%false%>">
+          <filters precondition="aql:false">
             <listeners domainClass="EObject" featureName="eContainer"/>
           </filters>
           <element name="element"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/paneBasedSelectionWizard/paneBasedSelection.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/paneBasedSelectionWizard/paneBasedSelection.odesign
index d995e4e9ac..5a35a50ec5 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/paneBasedSelectionWizard/paneBasedSelection.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/paneBasedSelectionWizard/paneBasedSelection.odesign
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="paneBasedSelection" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="paneBasedSelection" version="10.0.0.201505222000">
   <ownedViewpoints name="paneBasedSelectionTests" modelFileExtension="ecore">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PaneBasedSelectionTestDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="&lt;%eContainer == null%>">
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PaneBasedSelectionTestDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.eContainer() == null">
       <defaultLayer name="Default">
         <nodeMappings name="Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass">
           <style xsi:type="style:SquareDescription">
@@ -10,13 +10,13 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </nodeMappings>
-        <edgeMappings name="Supertypes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='paneBasedSelectionTests']/@ownedRepresentations[name='PaneBasedSelectionTestDiagram']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='paneBasedSelectionTests']/@ownedRepresentations[name='PaneBasedSelectionTestDiagram']/@defaultLayer/@nodeMappings[name='Class']" targetFinderExpression="&lt;%eSuperTypes%>">
-          <style targetArrow="InputClosedArrow">
+        <edgeMappings name="Supertypes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='paneBasedSelectionTests']/@ownedRepresentations[name='PaneBasedSelectionTestDiagram']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='paneBasedSelectionTests']/@ownedRepresentations[name='PaneBasedSelectionTestDiagram']/@defaultLayer/@nodeMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes">
+          <style targetArrow="InputClosedArrow" sizeComputationExpression="[eContents()->size()/]">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </edgeMappings>
         <containerMappings name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='paneBasedSelectionTests']/@ownedRepresentations[name='PaneBasedSelectionTestDiagram']/@defaultLayer/@nodeMappings[name='Class']">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/validation/ticket1666.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/validation/ticket1666.odesign
index a45afd8a7a..5d595a99bc 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/validation/ticket1666.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/validation/ticket1666.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="ticket1666" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="ticket1666" version="10.0.0.201505222000">
   <ownedViewpoints name="Ticket 1666" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Validation" initialisation="true" domainClass="EPackage">
       <defaultLayer name="Default">
@@ -11,7 +11,7 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:ShapeContainerStyleDescription">
+          <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
@@ -28,7 +28,7 @@
           <audits auditExpression="&lt;%target.name.startsWith(&quot;p&quot;)%>"/>
         </ownedRules>
       </validationSet>
-      <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="&lt;%eSubpackages %>" nodeMapping="//@ownedViewpoints[name='Ticket%201666']/@ownedRepresentations[name='Breakdown']/@defaultLayer/@nodeMappings[name='Package']"/>
+      <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="aql:self.eSubpackages" nodeMapping="//@ownedViewpoints[name='Ticket%201666']/@ownedRepresentations[name='Breakdown']/@defaultLayer/@nodeMappings[name='Package']"/>
       <defaultLayer name="Default">
         <nodeMappings name="Package" semanticCandidatesExpression="&lt;%eAllContents.filter(&quot;EPackage&quot;)%>" domainClass="EPackage">
           <style xsi:type="style:SquareDescription" labelExpression="container_&lt;%name%>" sizeComputationExpression="7" labelPosition="node" resizeKind="NSEW">
@@ -38,7 +38,7 @@
           </style>
         </nodeMappings>
         <edgeMappings name="Containers" sourceMapping="//@ownedViewpoints[name='Ticket%201666']/@ownedRepresentations[name='Breakdown']/@defaultLayer/@nodeMappings[name='Package']" targetMapping="//@ownedViewpoints[name='Ticket%201666']/@ownedRepresentations[name='Breakdown']/@defaultLayer/@nodeMappings[name='Package']" targetFinderExpression="feature:eContainer">
-          <style sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET">
+          <style routingStyle="tree" foldingStyle="TARGET">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
             <centerLabelStyleDescription labelExpression="relation_edge_&lt;%name%>">
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/variablefilter/ticketvp1063/vp-1063.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/variablefilter/ticketvp1063/vp-1063.odesign
index ec609cb56d..30e5fc17a9 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/variablefilter/ticketvp1063/vp-1063.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/variablefilter/ticketvp1063/vp-1063.odesign
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="8.0.0">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="10.0.0.201505222000">
   <ownedViewpoints name="vp1063">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="vp1063" domainClass="EPackage">
       <filters xsi:type="filter:CompositeFilterDescription" name="Classifier">
         <filters xsi:type="filter:VariableFilter" semanticConditionExpression="&lt;%$EClass.nContains(current)%>">
-          <ownedVariables candidatesExpression="&lt;%eClassifiers%>" multiple="true" name="EClass"/>
+          <ownedVariables candidatesExpression="aql:self.eClassifiers" multiple="true" name="EClass"/>
         </filters>
       </filters>
       <defaultLayer name="Default">
         <containerMappings name="EClass" domainClass="EClass">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -17,7 +17,7 @@
           </style>
         </containerMappings>
         <containerMappings name="EEnum" domainClass="EEnum">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -25,7 +25,7 @@
           </style>
         </containerMappings>
         <containerMappings name="EPackage" domainClass="EPackage">
-          <style xsi:type="style:FlatContainerStyleDescription">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>