diff --git a/addons/swagger/plugins/org.obeonetwork.dsl.soa.gen.swagger/.classpath b/addons/swagger/plugins/org.obeonetwork.dsl.soa.gen.swagger/.classpath
index c67edeea8..afff6e9cc 100644
--- a/addons/swagger/plugins/org.obeonetwork.dsl.soa.gen.swagger/.classpath
+++ b/addons/swagger/plugins/org.obeonetwork.dsl.soa.gen.swagger/.classpath
@@ -138,36 +138,6 @@
 	<classpathentry exported="true" kind="lib" path="target/jars/jakarta.inject-api-2.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/jakarta.servlet-api-6.1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/jakarta.transaction-api-1.3.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-alpn-client-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-annotations-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-client-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-compression-common-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-compression-gzip-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-annotations-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-nested-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-plus-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-security-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-servlet-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-webapp-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-websocket-jetty-api-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-websocket-jetty-client-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-websocket-jetty-common-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-websocket-jetty-server-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee8-websocket-servlet-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-ee-webapp-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-http-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-io-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-jndi-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-plus-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-security-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-server-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-servlet-api-4.0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-session-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-util-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-websocket-core-client-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-websocket-core-common-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-websocket-core-server-12.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/jetty-xml-12.1.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/jna-5.17.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/jna-platform-5.17.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/jspecify-1.0.0.jar"/>
@@ -176,30 +146,6 @@
 	<classpathentry exported="true" kind="lib" path="target/jars/org.bndtools.versioncontrol.ignores.manager-7.1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/org.bndtools.versioncontrol.ignores.plugin.git-7.1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/org.eclipse.nebula.treemapper-0.1.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.cinematic.edit-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.cinematic-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.database-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.entity.edit-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.entity-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.environment.binding.dialect.ui-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.environment.binding.dialect-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.environment.common-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.environment.design.services-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.environment.design-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.environment.edit-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.environment-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.is-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.overview.edit-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.overview.editor-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.overview-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.soa.edit-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.soa-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.technicalid.edit-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.technicalid-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.dsl.typeslibrary-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.tools.migration-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.utils.common.ui-5.2.0-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/org.obeonetwork.utils.common-5.2.0-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/org.osgi.dto-1.0.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/org.osgi.framework-1.8.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/org.osgi.resource-1.0.0.jar"/>
@@ -209,6 +155,5 @@
 	<classpathentry exported="true" kind="lib" path="target/jars/org.osgi.util.tracker-1.5.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/org.ow2.sat4j.core-2.3.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="target/jars/org.ow2.sat4j.pb-2.3.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="target/jars/osgi.annotation-8.1.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/commons/tools/plugins/org.obeonetwork.tools.classdiagramgenerator.editor/description/StructuredTypesDiagramTemplate.odesign b/commons/tools/plugins/org.obeonetwork.tools.classdiagramgenerator.editor/description/StructuredTypesDiagramTemplate.odesign
index 69af9819a..9eefa4531 100644
--- a/commons/tools/plugins/org.obeonetwork.tools.classdiagramgenerator.editor/description/StructuredTypesDiagramTemplate.odesign
+++ b/commons/tools/plugins/org.obeonetwork.tools.classdiagramgenerator.editor/description/StructuredTypesDiagramTemplate.odesign
@@ -1,9 +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" 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="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="StructuredTypesDiagram" version="12.0.0.2017041100">
+<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" documentation="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="StructuredTypesDiagram" version="15.4.0.202401051836">
   <ownedViewpoints name="StructuredTypesDiagramTemplate">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{Hierarchy.id}']/@defaultLayer/@toolSections.1/@ownedTools[name='DAD_Namespace']" name="{Hierarchy.id}" label="{Hierarchy.label}" titleExpression="{Hierarchy.titleExpression}" domainClass="{Hierarchy.domainClass}">
       <metamodel href="http://www.obeonetwork.org/dsl/environment/3.0.0#/"/>
       <metamodel href="http://www.eclipse.org/sirius/diagram/1.1.0#/"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="15.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="12.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="ORTHOGONAL"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default">
         <containerMappings name="ND_Namespace" detailDescriptions="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{Hierarchy.id}']/@defaultLayer/@toolSections.1/@ownedTools[name='New%20Class%20Diagram']" deletionDescription="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{Hierarchy.id}']/@defaultLayer/@toolSections.1/@ownedTools[name='DEL_ND_Namespace']" labelDirectEdit="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{Hierarchy.id}']/@defaultLayer/@toolSections.1/@ownedTools[name='Namespace%20Name%20Direct%20Edit']" semanticCandidatesExpression="{Hierarchy.namespaceContainer.semanticCandidates}" doubleClickDescription="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{Hierarchy.id}']/@defaultLayer/@toolSections.1/@ownedTools[name='Go%20to%20Class%20Diagram']" domainClass="environment.Namespace" dropDescriptions="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{Hierarchy.id}']/@defaultLayer/@toolSections.1/@ownedTools[name='DAD_Namespace']" reusedContainerMappings="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{Hierarchy.id}']/@defaultLayer/@containerMappings[name='ND_Namespace']">
           <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Class%20Diagram']/@entries[name='Namespace_border']" labelSize="10" labelColor="//@userColorsPalettes[name='Class%20Diagram']/@entries[name='Namespace_color']" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Class%20Diagram']/@entries[name='Namespace_background']" foregroundColor="//@userColorsPalettes[name='Class%20Diagram']/@entries[name='Namespace_foreground']">
@@ -17,7 +33,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="environment::Namespace" referenceName="ownedNamespaces">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'namespace' + self.eContainer(environment::NamespacesContainer).ownedNamespaces->size()"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'namespace_' + self.eContainer(environment::NamespacesContainer).ownedNamespaces->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -134,6 +150,22 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@defaultLayer/@toolSections.5/@ownedTools[name='{ClassDiagram.section.usability.dragdrop.structuredtype.id}'] //@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@defaultLayer/@toolSections.5/@ownedTools[name='DAD_ED_Enumeration'] //@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@defaultLayer/@toolSections.0/@ownedTools[name='DAD_ED_Namespace'] //@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@additionalLayers[name='{ClassDiagram.ExternalTypesLayer.label}']/@toolSections.1/@ownedTools[name='DAD_ED_ExternalStructuredType_Referenced']" name="{ClassDiagram.id}" label="{ClassDiagram.label}" titleExpression="{ClassDiagram.titleExpression}" domainClass="environment.Namespace" preconditionExpression="{ClassDiagram.precondition}">
       <metamodel href="http://www.obeonetwork.org/dsl/environment/3.0.0#/"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="15.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="12.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="ORTHOGONAL"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default">
         <edgeMappings name="ED_Reference_Type_Type" preconditionExpression="aql:self.oppositeOf = null" deletionDescription="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@defaultLayer/@toolSections.5/@ownedTools[name='DEL_Generic']" labelDirectEdit="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@defaultLayer/@toolSections.5/@ownedTools[name='EDT_ED_Reference']" semanticCandidatesExpression="service:diagram.getReferences()" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@defaultLayer/@containerMappings[name='{ClassDiagram.StructuredTypeMapping.id}'] //@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@additionalLayers[name='{ClassDiagram.ExternalTypesLayer.label}']/@containerMappings[name='ED_ExternalStructuredType_Referenced']" targetMapping="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@defaultLayer/@containerMappings[name='{ClassDiagram.StructuredTypeMapping.id}'] //@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@additionalLayers[name='{ClassDiagram.ExternalTypesLayer.label}']/@containerMappings[name='ED_ExternalStructuredType_Referenced']" targetFinderExpression="feature:referencedType" sourceFinderExpression="feature:containingType" domainClass="environment.Reference" useDomainElement="true" reconnections="//@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@defaultLayer/@toolSections.5/@ownedTools[name='REC_ED_Reference_Target'] //@ownedViewpoints[name='StructuredTypesDiagramTemplate']/@ownedRepresentations[name='{ClassDiagram.id}']/@defaultLayer/@toolSections.5/@ownedTools[name='REC_ED_Reference_Source']">
           <style strokeColor="//@userColorsPalettes[name='Class%20Diagram']/@entries[name='ISDLabelAndEdge']" targetArrow="NoDecoration">
diff --git a/commons/utils/plugins/org.obeonetwork.utils.common.ui/META-INF/MANIFEST.MF b/commons/utils/plugins/org.obeonetwork.utils.common.ui/META-INF/MANIFEST.MF
index 09b8986cb..574449dfb 100644
--- a/commons/utils/plugins/org.obeonetwork.utils.common.ui/META-INF/MANIFEST.MF
+++ b/commons/utils/plugins/org.obeonetwork.utils.common.ui/META-INF/MANIFEST.MF
@@ -29,7 +29,10 @@ Require-Bundle: org.eclipse.sirius.common,
  org.eclipse.eef.ide.ui,
  org.eclipse.sirius.ext.emf.edit,
  org.eclipse.eef.common,
- org.eclipse.emf.edit.ui
+ org.eclipse.emf.edit.ui,
+ org.eclipse.elk.graph,
+ org.eclipse.elk.core.service,
+ org.eclipse.sirius.diagram.elk
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.obeonetwork.utils
 Bundle-ActivationPolicy: lazy
@@ -39,3 +42,4 @@ Export-Package: org.obeonetwork.utils.common.ui,
  org.obeonetwork.utils.common.ui.handlers,
  org.obeonetwork.utils.common.ui.propertyTesters,
  org.obeonetwork.utils.common.ui.services
+Import-Package: com.google.common.collect
diff --git a/commons/utils/plugins/org.obeonetwork.utils.common.ui/src/org/obeonetwork/utils/common/ui/services/ElkUtils.java b/commons/utils/plugins/org.obeonetwork.utils.common.ui/src/org/obeonetwork/utils/common/ui/services/ElkUtils.java
new file mode 100644
index 000000000..b698a7641
--- /dev/null
+++ b/commons/utils/plugins/org.obeonetwork.utils.common.ui/src/org/obeonetwork/utils/common/ui/services/ElkUtils.java
@@ -0,0 +1,343 @@
+/* ************************************************************************* *
+ * Copyright (c) 2026 Obeo.
+ * 
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ * 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ *   Obeo - initial API and implementation.
+ * 
+ * ************************************************************************* */
+package org.obeonetwork.utils.common.ui.services;
+
+import com.google.common.collect.BiMap;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.PrecisionPoint;
+import org.eclipse.draw2d.geometry.PrecisionRectangle;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.elk.core.math.KVector;
+import org.eclipse.elk.core.options.CoreOptions;
+import org.eclipse.elk.core.options.PortConstraints;
+import org.eclipse.elk.core.options.PortSide;
+import org.eclipse.elk.core.service.LayoutMapping;
+import org.eclipse.elk.core.util.ElkUtil;
+import org.eclipse.elk.graph.ElkConnectableShape;
+import org.eclipse.elk.graph.ElkEdge;
+import org.eclipse.elk.graph.ElkEdgeSection;
+import org.eclipse.elk.graph.ElkGraphElement;
+import org.eclipse.elk.graph.ElkLabel;
+import org.eclipse.elk.graph.ElkNode;
+import org.eclipse.elk.graph.ElkPort;
+import org.eclipse.elk.graph.util.ElkGraphUtil;
+import org.eclipse.emf.common.util.ECollections;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.description.DiagramDescription;
+import org.eclipse.sirius.diagram.elk.ElkDiagramLayoutConnector;
+import org.eclipse.sirius.ext.gmf.runtime.editparts.GraphicalHelper;
+
+/**
+ * Common methods for ELK layout extension.
+ *
+ * @author Nicolas Peransin
+ */
+public final class ElkUtils {
+
+	/**
+	 * Description of an edge.
+	 * <p>
+	 * This description is used to restore extracted edge. It must be regular.
+	 * </p>
+	 * 
+	 * @param element   the edge
+	 * @param source    element the edge comes from
+	 * @param target    element the edge goes to
+	 * @param container element containing the edge
+	 * @param part      mapping of this edge
+	 */
+	public record EdgeDescription(ElkEdge element, Object part, ElkNode container,
+			// ends
+			ElkConnectableShape source, ElkConnectableShape target) {
+
+		/**
+		 * Constructor.
+		 * 
+		 * @param element       edge to describe
+		 * @param layoutMapping
+		 */
+		EdgeDescription(ElkEdge element, LayoutMapping layoutMapping) {
+			this(element, layoutMapping.getGraphMap().get(element), element.getContainingNode(),
+					// ends
+					element.getSources().get(0), element.getTargets().get(0));
+		}
+	}
+
+	/**
+	 * Private constructor to avoid instantiation.
+	 */
+	private ElkUtils() {
+	}
+
+	/**
+	 * Set the port label next to the port, on its {@code portSide} side, and
+	 * centered on the other axis:
+	 * <UL>
+	 * <LI>West: On the left of the port, vertically centered,</LI>
+	 * <LI>East: On the right of the port, vertically centered,</LI>
+	 * <LI>South: Under the port, horizontally centered,</LI>
+	 * <LI>North: Above the port, horizontally centered.</LI>
+	 * </UL>
+	 * This method can only be used for port with one label. It has no effect in
+	 * other case.
+	 *
+	 * @param port     The port for which to set the label location.
+	 * @param portSide The side where setting the label
+	 */
+	public static void alignPortLabel(ElkPort port, PortSide portSide) {
+		if (port.getLabels().size() != 1) {
+			// Cannot deal with multi-label. Not in Sirius 6.4x.
+			return;
+		}
+		ElkLabel label = port.getLabels().get(0);
+
+		// By default, we have the center
+
+		double x = (port.getWidth() - label.getWidth()) / 2;
+		double y = (port.getHeight() - label.getHeight()) / 2;
+
+		switch (portSide) {
+		case WEST:
+			x = -label.getWidth() - 1;
+			break;
+		case EAST:
+			x = port.getWidth() + 1;
+			break;
+		case SOUTH:
+			y = port.getHeight() + 1;
+			break;
+		case NORTH:
+			y = -label.getHeight() - 1;
+			break;
+
+		default:
+			// no change
+			return;
+		}
+		label.setLocation(x, y);
+	}
+
+	/**
+	 * This method inverses the source and the target of the edge.
+	 * <p>
+	 * The source and target coordinates are also inverted (and the sections if
+	 * any).
+	 * </p>
+	 *
+	 * @param elkEdge The edge to reverse.
+	 * @throws IllegalArgumentException In case of the <code>elkEdge</code> is an
+	 *                                  hyperedge.
+	 */
+	public static void reverseEdge(ElkEdge elkEdge) throws IllegalArgumentException {
+		if (isRegular(elkEdge)) { //
+			throw new IllegalArgumentException("Cannot reverse \"hyper\" edge"); //$NON-NLS-1$
+		}
+		ElkConnectableShape source = elkEdge.getSources().remove(0);
+		ElkConnectableShape target = elkEdge.getTargets().remove(0);
+
+		elkEdge.getSources().add(target);
+		elkEdge.getTargets().add(source);
+
+		for (ElkEdgeSection section : elkEdge.getSections()) {
+			double oldStartX = section.getStartX();
+			double oldStartY = section.getStartY();
+			section.setStartX(section.getEndX());
+			section.setStartY(section.getEndY());
+			section.setEndX(oldStartX);
+			section.setEndY(oldStartY);
+
+			ECollections.reverse(section.getBendPoints());
+		}
+	}
+
+	/**
+	 * Evaluates if the description of a diagram is provided by a plugin with
+	 * provided ID.
+	 * 
+	 * @param pluginId the ID of plugin
+	 * @param diagram  the diagram to evaluate
+	 * @return true if description is provided by plugin
+	 */
+	public static boolean isDescriptionFromPlugin(String pluginId, DDiagram diagram) {
+		String path = diagram.getDescription().eResource().getURI().toString();
+		String pluginBase = "platform:/plugin/" + pluginId + '/'; //$NON-NLS-1$
+		if (path.startsWith(pluginBase)) {
+			return true;
+		}
+		String resBase = "platform:/resource/" + pluginId + '/'; //$NON-NLS-1$
+		return path.startsWith(resBase);
+	}
+
+	/**
+	 * Evaluates if an edge is not hyper edge and well-formed.
+	 * 
+	 * @param edge ELK element
+	 * @return true if source size is 1 and target size is 1
+	 */
+	public static boolean isRegular(ElkEdge edge) {
+		return edge.getSources().size() == 1 && edge.getTargets().size() == 1;
+	}
+
+	/**
+	 * Creates a stream of all ports in this node and inside it.
+	 * 
+	 * @param root   the node to explore
+	 * @param filter the predicate to select port
+	 * @return a stream of port
+	 */
+	public static Stream<ElkPort> streamAllPorts(ElkNode root, Predicate<? super ElkPort> filter) {
+		return streamAllElements(root, ElkNode::getPorts, filter);
+	}
+
+	/**
+	 * Creates a stream of all edges in this node and inside it.
+	 * 
+	 * @param root   the node to explore
+	 * @param filter the predicate to select edge
+	 * @return a stream of edge
+	 */
+	public static Stream<ElkEdge> streamAllEdges(ElkNode root, Predicate<? super ElkEdge> filter) {
+		return streamAllElements(root, ElkNode::getContainedEdges, filter);
+	}
+
+	/**
+	 * Creates a stream of all nodes in this node and inside it.
+	 * 
+	 * @param root   the node to explore
+	 * @param filter the predicate to select node
+	 * @return a stream of node
+	 */
+	public static Stream<ElkNode> streamAllNodes(ElkNode root, Predicate<? super ElkNode> filter) {
+		return streamAllElements(root, ElkNode::getChildren, filter);
+	}
+
+	private static <T extends ElkGraphElement> Stream<T> streamAllElements(ElkNode root,
+			Function<ElkNode, List<T>> property, Predicate<? super T> filter) {
+		// We collect contained edges with source port and target port with the same
+		// parent.
+		Stream<T> nodes = property.apply(root).stream().filter(filter);
+
+		// We recursively collect them for each child
+		Stream<T> childrenNodes = root.getChildren().stream()
+				.flatMap(child -> streamAllElements(child, property, filter));
+		return Stream.concat(nodes, childrenNodes);
+	}
+
+	/**
+	 * Recreates an edge using it description.
+	 * 
+	 * @param description   description of an edge
+	 * @param layoutMapping mapping using the edge
+	 * @return edge
+	 */
+	public static ElkEdge createEdge(EdgeDescription description, LayoutMapping layoutMapping) {
+		ElkEdge edge = description.element;
+
+		// Restore edge properties
+		edge.getSources().add(description.source);
+		edge.getTargets().add(description.target);
+		description.container.getContainedEdges().add(edge);
+
+		// Compute ends location
+		KVector sourceKVector = getParentRelativeVector(description.source, description.container);
+		KVector targetKVector = getParentRelativeVector(description.target, description.container);
+
+		ElkEdgeSection section = edge.getSections().get(0);
+
+		Rectangle sourceArea = createAreaAtPoint(sourceKVector, description.source);
+		Rectangle targetArea = createAreaAtPoint(targetKVector, description.target);
+
+		computeSectionEnd(section, true, sourceArea, targetArea, sourceKVector);
+		computeSectionEnd(section, false, sourceArea, targetArea, targetKVector);
+
+		// Remove potential bendpoints to have a straight edge
+		section.getBendPoints().clear();
+
+		// Add the edge in the mapping to be considered in the next steps (apply ELK
+		// layout to Sirius)
+		layoutMapping.getGraphMap().put(edge, description.part);
+
+		return edge;
+	}
+
+	/**
+	 * Returns the relative vector of provided shape.
+	 * 
+	 * @param element   the graphical element
+	 * @param container the container to be relative to
+	 * @return the vector
+	 */
+	private static KVector getParentRelativeVector(ElkConnectableShape it, ElkNode container) {
+		KVector point = new KVector(it.getX(), it.getY());
+		return ElkUtil.toRelative(ElkUtil.toAbsolute(point, container), ElkGraphUtil.connectableShapeToNode(it));
+	}
+
+	private static PrecisionRectangle createAreaAtPoint(KVector point, ElkConnectableShape shape) {
+		return new PrecisionRectangle(point.x, point.y, shape.getWidth(), shape.getHeight());
+	}
+
+	private static void computeSectionEnd(ElkEdgeSection section, boolean forSource, Rectangle sourceArea,
+			Rectangle targetArea, KVector byDefault) {
+		Rectangle containingArea = forSource ? sourceArea : targetArea;
+
+		Point intersection = GraphicalHelper
+				.getIntersection(sourceArea.getCenter(), targetArea.getCenter(), containingArea, forSource) // default
+																											// should be
+																											// the same
+																											// place.
+				.orElse(new PrecisionPoint(byDefault.x, byDefault.y));
+
+		if (forSource) {
+			section.setStartLocation(intersection.preciseX(), intersection.preciseY());
+		} else {
+			section.setEndLocation(intersection.preciseX(), intersection.preciseY());
+		}
+	}
+
+	/**
+	 * Forces the side of the port.
+	 * 
+	 * @param port the port to hint
+	 * @param side the expected side
+	 */
+	public static void forceSide(ElkPort port, PortSide side) {
+		port.setProperty(CoreOptions.PORT_SIDE, side);
+		port.getParent().setProperty(CoreOptions.PORT_CONSTRAINTS, PortConstraints.FIXED_SIDE);
+	}
+	
+	/**
+	 * Return the {@link DDiagram} concerned by this {@link LayoutMapping}.
+	 *
+	 * @param layoutMapping The ELK layout mapping
+	 * @return the {@link DiagramDescription} name of the {@link DDiagram} concerned
+	 *         by this {@link LayoutMapping}.
+	 */
+	public static DDiagram getDDiagram(LayoutMapping layoutMapping) {
+		// Retrieve the root diagram editPart
+		DiagramEditPart diagramEditPart = layoutMapping.getProperty(ElkDiagramLayoutConnector.DIAGRAM_EDIT_PART);
+
+		// Retrieve the GMF diagram
+		Diagram gmfDiagram = diagramEditPart.getDiagramView();
+		return gmfDiagram.getElement() instanceof DDiagram ? (DDiagram) gmfDiagram.getElement() : null;
+	}
+}
+
diff --git a/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/META-INF/MANIFEST.MF b/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/META-INF/MANIFEST.MF
index d19be70ab..d368afa22 100644
--- a/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/META-INF/MANIFEST.MF
+++ b/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/META-INF/MANIFEST.MF
@@ -28,9 +28,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.sirius.diagram.ui.ext,
  org.obeonetwork.dsl.environment.properties,
  org.obeonetwork.dsl.environment.design,
- org.obeonetwork.dsl.environment
+ org.obeonetwork.dsl.environment,
+ org.eclipse.sirius.diagram.elk,
+ org.eclipse.elk.core.service,
+ org.eclipse.elk.graph,
+ org.eclipse.elk.alg.layered,
+ org.eclipse.sirius.diagram.model
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Vendor: Obeo Network
 Export-Package: org.obeonetwork.dsl.cinematic.design,
  org.obeonetwork.dsl.cinematic.design.services,
diff --git a/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/description/cinematic.odesign b/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/description/cinematic.odesign
index c7b3709e0..7b0eae8dd 100644
--- a/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/description/cinematic.odesign
+++ b/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/description/cinematic.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/tree/description/1.0.0" xmlns:properties="http://www.eclipse.org/sirius/properties/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" documentation="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="Cinematic" version="12.0.0.2017041100">
+<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/tree/description/1.0.0" xmlns:properties="http://www.eclipse.org/sirius/properties/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" documentation="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="Cinematic" version="15.4.0.202401051836">
   <ownedViewpoints endUserDocumentation="The &lt;b>Cinematic Views&lt;/b> viewpoint provides three representations : &#xD;&#xA;&lt;ul>&#xD;&#xA;&lt;li>&lt;b>UI Structure&lt;/b> : a tree allowing to structure the Cinematic model contents,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Package Diagram&lt;/b> : a diagram allowing to represent and edit a package strucure,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Flow Diagram&lt;/b> : a flow diagram allowing to represent and edit a flow.&lt;/li>&#xD;&#xA;&lt;/ul>&#xA;" name="Cinematic Views">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Reused Description" domainClass="cinematic.CinematicRoot" preconditionExpression="false">
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.cinematic/model/cinematic.ecore#/"/>
@@ -29,7 +29,25 @@
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.cinematic/model/cinematic.ecore#/"/>
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.cinematic/model/cinematic.ecore#//view"/>
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.cinematic/model/cinematic.ecore#//toolkits"/>
-      <layout xsi:type="description_1:CompositeLayout" padding="15" direction="LeftToRight"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.hierarchyHandling">
+          <targets>NODE</targets>
+          <targets>PARENT</targets>
+          <value name="INCLUDE_CHILDREN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.layered.layering.strategy">
+          <targets>PARENT</targets>
+          <value name="LONGEST_PATH"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="ORTHOGONAL"/>
+        </layoutOptions>
+      </layout>
       <diagramInitialisation>
         <firstModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclAsType(flow::Flow).states->filter(flow::InitialState)->isEmpty()">
           <subModelOperations xsi:type="tool_1:CreateInstance" typeName="flow.InitialState" referenceName="states">
@@ -607,6 +625,33 @@
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.cinematic/model/cinematic.ecore#//flow"/>
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.cinematic/model/cinematic.ecore#//view"/>
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.cinematic/model/cinematic.ecore#//toolkits"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="UP"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="15.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="12.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.hierarchyHandling">
+          <targets>NODE</targets>
+          <targets>PARENT</targets>
+          <value name="INCLUDE_CHILDREN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.layered.spacing.nodeNodeBetweenLayers" value="60.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.layered.nodePlacement.strategy">
+          <targets>PARENT</targets>
+          <value name="NETWORK_SIMPLEX"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.nodeNode" value="40.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default">
         <containerMappings name="PAD_Package" detailDescriptions="//@ownedViewpoints[name='Cinematic%20Views']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@toolSections.1/@ownedTools[name='CRE_Package_Diagram'] //@ownedViewpoints[name='Cinematic%20Views']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@toolSections.1/@ownedTools[name='CRE_UI_Structure']" deletionDescription="//@ownedViewpoints[name='Cinematic%20Views']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@toolSections.1/@ownedTools[name='PAD_DEL_PackageDiagram_node']" labelDirectEdit="//@ownedViewpoints[name='Cinematic%20Views']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='EDT_Common']" semanticCandidatesExpression="feature:subPackages" doubleClickDescription="//@ownedViewpoints[name='Cinematic%20Views']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@toolSections.1/@ownedTools[name='DBL_Nav_To_Package_Diagram']" domainClass="cinematic::AbstractPackage" dropDescriptions="//@ownedViewpoints[name='Cinematic%20Views']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@toolSections.1/@ownedTools[name='DND_AbstractPackage_content']" reusedContainerMappings="//@ownedViewpoints[name='Cinematic%20Views']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@containerMappings[name='PAD_Package'] //@ownedViewpoints[name='Cinematic%20Views']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@containerMappings[name='PAD_ViewContainer'] //@ownedViewpoints[name='Cinematic%20Views']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@containerMappings[name='PAD_Flow']">
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='DomainColors']/@entries[name='ISDBorder']" labelSize="10" labelColor="//@userColorsPalettes[name='DomainColors']/@entries[name='ISDLabelAndEdge']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='DomainColors']/@entries[name='CinematicFillLight']" foregroundColor="//@userColorsPalettes[name='DomainColors']/@entries[name='CinematicFillLight']">
diff --git a/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/plugin.xml b/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/plugin.xml
index 8a3d14d61..77110d511 100644
--- a/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/plugin.xml
+++ b/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/plugin.xml
@@ -292,4 +292,10 @@
            definition="org.obeonetwork.dsl.cinematic.design.extension.ViewContainerChildrenContribution">
      </client>
   </extension>
+  <extension
+        point="org.eclipse.sirius.diagram.elk.layout.extension">
+     <layoutExtension
+           class="org.obeonetwork.dsl.cinematic.design.elk.CinematicElkExtension">
+     </layoutExtension>
+  </extension>
 </plugin>
diff --git a/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/src/org/obeonetwork/dsl/cinematic/design/elk/CinematicElkExtension.java b/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/src/org/obeonetwork/dsl/cinematic/design/elk/CinematicElkExtension.java
new file mode 100644
index 000000000..62dbaa844
--- /dev/null
+++ b/designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/src/org/obeonetwork/dsl/cinematic/design/elk/CinematicElkExtension.java
@@ -0,0 +1,83 @@
+/* ************************************************************************* *
+ * Copyright (c) 2026 Obeo.
+ * 
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ * 
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ *   Obeo - initial API and implementation.
+ * 
+ * ************************************************************************* */
+package org.obeonetwork.dsl.cinematic.design.elk;
+
+import java.util.stream.Stream;
+
+import org.eclipse.elk.alg.layered.options.LayerConstraint;
+import org.eclipse.elk.alg.layered.options.LayeredMetaDataProvider;
+import org.eclipse.elk.core.service.LayoutMapping;
+import org.eclipse.elk.graph.ElkNode;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.DDiagramElement;
+import org.eclipse.sirius.diagram.elk.GmfLayoutCommand;
+import org.eclipse.sirius.diagram.elk.IELKLayoutExtension;
+import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeSpec;
+import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeEditPart;
+import org.obeonetwork.dsl.cinematic.flow.FinalState;
+import org.obeonetwork.dsl.cinematic.flow.InitialState;
+import org.obeonetwork.utils.common.ui.services.ElkUtils;
+
+/**
+ * @author Vincent BOUSSAUD
+ *
+ */
+public class CinematicElkExtension implements IELKLayoutExtension {
+
+	/**
+	 * 
+	 */
+	public CinematicElkExtension() {
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * Add specific constraints to cinematic element for their layout
+	 */
+	@Override
+	public void beforeELKLayout(LayoutMapping layoutMapping) {
+		final Stream<ElkNode> initialNodes = ElkUtils
+				.streamAllNodes(layoutMapping.getLayoutGraph(), ElkNode.class::isInstance)
+				.filter(eNode -> (layoutMapping.getGraphMap().get(eNode) instanceof GraphicalEditPart)
+						? ((DDiagramElement) ((View)((GraphicalEditPart) layoutMapping.getGraphMap().get(eNode))
+								.getModel()).getElement()).getTarget() instanceof InitialState
+						: false);
+		initialNodes.findFirst().ifPresent(node -> node.setProperty(LayeredMetaDataProvider.LAYERING_LAYER_CONSTRAINT,
+				LayerConstraint.FIRST_SEPARATE));
+		final Stream<ElkNode> finalNodes = ElkUtils
+				.streamAllNodes(layoutMapping.getLayoutGraph(), ElkNode.class::isInstance)
+				.filter(eNode -> (layoutMapping.getGraphMap().get(eNode) instanceof GraphicalEditPart)
+						? ((DDiagramElement) ((View)((GraphicalEditPart) layoutMapping.getGraphMap().get(eNode))
+								.getModel()).getElement()).getTarget() instanceof FinalState
+								: false);
+		finalNodes.findFirst().ifPresent(node -> node.setProperty(LayeredMetaDataProvider.LAYERING_LAYER_CONSTRAINT,
+				LayerConstraint.LAST_SEPARATE));
+	}
+
+	@Override
+	public void afterELKLayout(LayoutMapping layoutMapping) {
+		// nothing to do
+		
+	}
+
+	@Override
+	public void afterGMFCommandApplied(GmfLayoutCommand gmfLayoutCommand, LayoutMapping layoutMapping) {
+		// nothing to do
+		
+	}
+
+}
diff --git a/designs/database/plugins/org.obeonetwork.dsl.database.design/description/database.odesign b/designs/database/plugins/org.obeonetwork.dsl.database.design/description/database.odesign
index 7df1c90d1..80aa236e7 100644
--- a/designs/database/plugins/org.obeonetwork.dsl.database.design/description/database.odesign
+++ b/designs/database/plugins/org.obeonetwork.dsl.database.design/description/database.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:properties="http://www.eclipse.org/sirius/properties/1.0.0" xmlns:properties-ext-widgets-reference="http://www.eclipse.org/sirius/properties/1.0.0/ext/widgets/reference" 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="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="database" version="12.0.0.2017041100">
+<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:properties="http://www.eclipse.org/sirius/properties/1.0.0" xmlns:properties-ext-widgets-reference="http://www.eclipse.org/sirius/properties/1.0.0/ext/widgets/reference" 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="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="database" version="15.4.0.202401051836">
   <ownedViewpoints endUserDocumentation="The &lt;b>Database&lt;/b> viewpoint provides two representations : &#xD;&#xA;&lt;ul>&#xD;&#xA;&lt;li>&lt;b>Database Diagram&lt;/b> : a diagram allowing to represent and edit a database strucure,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Schema Diagram&lt;/b> : a diagram allowing to represent and edit a schema strucure.&lt;/li>&#xD;&#xA;&lt;/ul>&#xA;" name="Database" modelFileExtension="database">
     <validationSet reusedRules="//@extensions.0/@categories.0/@groups.2/@validationSet/@semanticValidationRules[name='database%3A%3AView%20query%20validation']"/>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Reused Description" domainClass="database::DataBase" preconditionExpression="false">
@@ -51,6 +51,44 @@
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DPV_DND_TableContainer_contents'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DPV_DND_Sequence'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@additionalLayers[name='External%20Tables']/@toolSections.0/@ownedTools[name='DPV_DND_ReferencedExternalTable'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DPV_DND_SequenceNode']" name="Database Diagram" titleExpression="aql:self.name + ' Database'" pasteDescriptions="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DB_Table']" domainClass="database::DataBase">
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.database/model/database.ecore#/"/>
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.typeslibrary/model/typeslibrary.ecore#/"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.alignment">
+          <targets>NODE</targets>
+          <value name="AUTOMATIC"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.layered.nodePlacement.bk.fixedAlignment">
+          <targets>PARENT</targets>
+          <value name="NONE"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.layered.crossingMinimization.strategy">
+          <targets>PARENT</targets>
+          <value name="LAYER_SWEEP"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="10.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="10.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.layered.nodePlacement.strategy">
+          <targets>PARENT</targets>
+          <value name="NETWORK_SIMPLEX"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:IntegerLayoutOption" id="org.eclipse.elk.layered.priority.straightness">
+          <targets>EDGE</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:BooleanLayoutOption" id="org.eclipse.elk.topdownLayout">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="ORTHOGONAL"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default">
         <edgeMappings name="DB_ForeignKey" deletionDescription="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DB_Delete']" labelDirectEdit="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Reused%20Description']/@defaultLayer/@toolSections.0/@ownedTools[name='EDT_DatabaseElement']" semanticCandidatesExpression="service:getForeignKeys(diagram)" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@containerMappings[name='DB_Table'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@additionalLayers[name='External%20Tables']/@containerMappings[name='DB_Referenced_External_Table']" targetMapping="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@containerMappings[name='DB_Table'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@additionalLayers[name='External%20Tables']/@containerMappings[name='DB_Referenced_External_Table']" targetFinderExpression="aql:self.getTargetTable()" sourceFinderExpression="aql:self.getSourceTable()" domainClass="database::ForeignKey" useDomainElement="true" reconnections="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DB_ForeignKey_Reconnect_Source'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DB_ForeignKey_Reconnect_Target']">
           <style strokeColor="//@userColorsPalettes[name='DomainColors']/@entries[name='ISDLabelAndEdge']">
@@ -496,6 +534,30 @@
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DPV_DND_TableContainer_contents'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DPV_DND_Sequence'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@additionalLayers[name='External%20Tables']/@toolSections.0/@ownedTools[name='DPV_DND_ReferencedExternalTable'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DPV_DND_SequenceNode']" name="Schema Diagram" titleExpression="aql:self.name + ' Schema'" pasteDescriptions="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='DB_Table']" domainClass="database::Schema">
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.database/model/database.ecore#/"/>
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.typeslibrary/model/typeslibrary.ecore#/"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.alignment">
+          <targets>NODE</targets>
+          <value name="AUTOMATIC"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="15.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="POLYLINE"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="12.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.layered.nodePlacement.strategy">
+          <targets>PARENT</targets>
+          <value name="NETWORK_SIMPLEX"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default" reusedMappings="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@containerMappings[name='DB_Table'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@edgeMappings[name='DB_ForeignKey'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@containerMappings[name='DB_View'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@containerMappings[name='DB_Sequence']">
         <toolSections name="Schemas" reusedTools="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='CRE_Table'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='CRE_View'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='CRE_Column'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='CRE_PKColumn'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='CRE_PrimaryKey'] //@ownedViewpoints[name='Database']/@ownedRepresentations[name='Database%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='CRE_ForeignKey']"/>
         <toolSections name="Sequences" reusedTools="//@ownedViewpoints[name='Database']/@ownedRepresentations[name='Reused%20Description']/@defaultLayer/@toolSections.0/@ownedTools[name='CRE_Sequence']"/>
diff --git a/designs/entity/plugins/org.obeonetwork.dsl.entity.design/description/entity.odesign b/designs/entity/plugins/org.obeonetwork.dsl.entity.design/description/entity.odesign
index 90d06f705..2e67e5d52 100644
--- a/designs/entity/plugins/org.obeonetwork.dsl.entity.design/description/entity.odesign
+++ b/designs/entity/plugins/org.obeonetwork.dsl.entity.design/description/entity.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/table/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:properties="http://www.eclipse.org/sirius/properties/1.0.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" documentation="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="Entity" version="12.0.0.2017041100">
+<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:properties="http://www.eclipse.org/sirius/properties/1.0.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" documentation="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="Entity" version="15.4.0.202401051836">
   <ownedViewpoints endUserDocumentation="The &lt;b>Entity Views&lt;/b> viewpoint provides three representations : &#xD;&#xA;&lt;ul>&#xD;&#xA;&lt;li>&lt;b>Entities Diagram&lt;/b> : a diagram allowing to represent and edit the Entities of a Namespace,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Entities Namespaces Hierarchy&lt;/b> : a diagram allowing to represent and edit the Namespace hierarchy of an Entity model,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Entity Table&lt;/b> : a table showing the Entities of an Entity model with their number of attributes, estimated volumetry and historized setting.&lt;/li>&#xD;&#xA;&lt;/ul>&#xA;" name="Entity Views" modelFileExtension="entity ois">
     <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Entity Table" domainClass="entity.Root">
       <metamodel href="http://www.obeonetwork.org/dsl/environment/3.0.0#/"/>
@@ -23,6 +23,22 @@
       <metamodel href="http://www.obeonetwork.org/dsl/environment/3.0.0#/"/>
       <metamodel href="http://www.eclipse.org/sirius/diagram/1.1.0#/"/>
       <metamodel href="http://www.obeonetwork.org/dsl/entity/3.0.0#/"/>
+      <layout xsi:type="description_2:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_2:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="15.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_2:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="12.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_2:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_2:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="ORTHOGONAL"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default">
         <containerMappings name="ND_Namespace" detailDescriptions="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='New%20Class%20Diagram']" deletionDescription="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='DEL_ND_Namespace']" labelDirectEdit="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='Namespace%20Name%20Direct%20Edit']" semanticCandidatesExpression="feature:ownedNamespaces" doubleClickDescription="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='Go%20to%20Class%20Diagram']" domainClass="environment.Namespace" dropDescriptions="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='DAD_Namespace']" reusedContainerMappings="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Namespaces%20Hierarchy']/@defaultLayer/@containerMappings[name='ND_Namespace']">
           <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_border']" labelSize="10" labelColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_color']" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_background']" foregroundColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_foreground']">
@@ -36,7 +52,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container">
                 <subModelOperations xsi:type="tool:CreateInstance" typeName="environment::Namespace" referenceName="ownedNamespaces">
-                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'namespace' + self.eContainer(environment::NamespacesContainer).ownedNamespaces->size()"/>
+                  <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'namespace_' + self.eContainer(environment::NamespacesContainer).ownedNamespaces->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -154,6 +170,22 @@
     <ownedRepresentations xsi:type="description_2:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='DAD_ED_Entity'] //@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='DAD_ED_Enumeration'] //@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DAD_ED_Namespace'] //@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@additionalLayers[name='External%20Entities']/@toolSections.1/@ownedTools[name='DAD_ED_ExternalStructuredType_Referenced']" name="Entities Diagram" label="Entities Diagram" titleExpression="aql:self.name + ' - Entities diagram'" domainClass="environment.Namespace" preconditionExpression="aql:self.ancestors()->filter(entity::Root)->notEmpty()">
       <metamodel href="http://www.obeonetwork.org/dsl/environment/3.0.0#/"/>
       <metamodel href="http://www.obeonetwork.org/dsl/entity/3.0.0#/"/>
+      <layout xsi:type="description_2:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_2:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="15.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_2:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="12.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_2:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_2:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="ORTHOGONAL"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default">
         <edgeMappings name="ED_Reference_Type_Type" preconditionExpression="aql:self.oppositeOf = null" deletionDescription="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='DEL_Generic']" labelDirectEdit="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='EDT_ED_Reference']" semanticCandidatesExpression="service:diagram.getReferences()" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@defaultLayer/@containerMappings[name='ED_Entity'] //@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@additionalLayers[name='External%20Entities']/@containerMappings[name='ED_ExternalStructuredType_Referenced']" targetMapping="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@defaultLayer/@containerMappings[name='ED_Entity'] //@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@additionalLayers[name='External%20Entities']/@containerMappings[name='ED_ExternalStructuredType_Referenced']" targetFinderExpression="feature:referencedType" sourceFinderExpression="feature:containingType" domainClass="environment.Reference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='REC_ED_Reference_Target'] //@ownedViewpoints[name='Entity%20Views']/@ownedRepresentations[name='Entities%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='REC_ED_Reference_Source']">
           <style strokeColor="//@userColorsPalettes[name='Palette']/@entries[name='ISDLabelAndEdge']" targetArrow="NoDecoration">
@@ -781,7 +813,7 @@
     <metamodels href="http://www.obeonetwork.org/dsl/entity/3.0.0#/"/>
     <categories name="Entity Category">
       <pages name="Entity Page {tabOrder=100}" labelExpression="Entity" domainClass="entity::Entity" semanticCandidateExpression="var:self">
-        <groups href="platform:/plugin/org.obeonetwork.dsl.environment.properties/description/environment-properties.odesign#//@extensions.0/@categories.0/@groups.0"/>
+        <groups href="../../../plugin/org.obeonetwork.dsl.environment.properties/description/environment-properties.odesign#//@extensions.0/@categories.0/@groups.0"/>
       </pages>
       <pages name="Persistence Page {tabOrder=200}" labelExpression="Persistence" domainClass="entity::Entity" semanticCandidateExpression="var:self" groups="//@extensions.0/@categories.0/@groups.0"/>
       <pages name="Root Page {tabOrder=100}" labelExpression="Root" domainClass="entity::Root" semanticCandidateExpression="var:self" groups="//@extensions.0/@categories.0/@groups.1"/>
diff --git a/designs/environment/plugins/org.obeonetwork.dsl.environment.design/description/environment.odesign b/designs/environment/plugins/org.obeonetwork.dsl.environment.design/description/environment.odesign
index 83e7e480f..90af0f6a9 100644
--- a/designs/environment/plugins/org.obeonetwork.dsl.environment.design/description/environment.odesign
+++ b/designs/environment/plugins/org.obeonetwork.dsl.environment.design/description/environment.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/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="environment" version="12.0.0.2017041100">
+<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" documentation="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="environment" version="15.4.0.202401051836">
   <ownedViewpoints endUserDocumentation="The &lt;b>Environment&lt;/b> viewpoint provides one representation : &#xD;&#xA;&lt;ul>&#xD;&#xA;&lt;li>&lt;b>Environment&lt;/b> : a tree allowing to define an environment model.&lt;/li>&#xD;&#xA;&lt;/ul>&#xA;" name="OD4IS_Environment" label="Environment" modelFileExtension="environment">
     <ownedRepresentations xsi:type="description_1:TreeDescription" name="E_Environment" label="Environment" domainClass="environment.Environment">
       <metamodel href="../../org.obeonetwork.dsl.environment/model/environment.ecore#/"/>
diff --git a/designs/graal/plugins/org.obeonetwork.graal.design/description/graal.odesign b/designs/graal/plugins/org.obeonetwork.graal.design/description/graal.odesign
index 08b57b7d6..719a0801f 100644
--- a/designs/graal/plugins/org.obeonetwork.graal.design/description/graal.odesign
+++ b/designs/graal/plugins/org.obeonetwork.graal.design/description/graal.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:properties="http://www.eclipse.org/sirius/properties/1.0.0" xmlns:properties-ext-widgets-reference="http://www.eclipse.org/sirius/properties/1.0.0/ext/widgets/reference" 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="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="graal" version="12.0.0.2017041100">
+<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:properties="http://www.eclipse.org/sirius/properties/1.0.0" xmlns:properties-ext-widgets-reference="http://www.eclipse.org/sirius/properties/1.0.0/ext/widgets/reference" 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="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="graal" version="15.4.0.202401051836">
   <ownedViewpoints endUserDocumentation="The &lt;b>Graal Methodology&lt;/b> viewpoint provides ten representations : &#xD;&#xA;&lt;ul>&#xD;&#xA;&lt;li>&lt;b>Actions Plan&lt;/b> : a diagram allowing to represent and edit the action plan of a Task,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Actors Graph&lt;/b> : a diagram allowing to represent and edit the Actors of a System,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Actors list&lt;/b> : a cross table showing the assignations of Actors to Tasks for a Use Case,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Domain Classes Diagram&lt;/b> : a diagram allowing to represent and edit the Domain Classes of a Namespace,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Domain Classes Namespaces Hierarchy&lt;/b> : a diagram allowing to represent and edit the Namespace hierarchy of a System,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Tasks Graph&lt;/b> : a diagram allowing to represent and edit the Tasks (and Task Groups) of a System and assign the Actors to Tasks,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>TasksGroup Graph&lt;/b> : a diagram allowing to represent and edit the Tasks of a Task Group and assign the Actors to Tasks,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Use Case Diagram&lt;/b> : a diagram allowing to represent and edit the Tasks of a Use Case and assign the Actors to Tasks,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>Use Cases Main View&lt;/b> : a diagram allowing to represent and edit the Use Cases of a System and edit relationships among them,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>User Stories Table&lt;/b> : a cross table showing the assignations of Tasks to User Stories for a System, allowing to create User Stories.&lt;/li>&#xD;&#xA;&lt;/ul>&#xA;" name="Graal Methodology" modelFileExtension="*.graal">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Reused Description" domainClass="graal.System" preconditionExpression="false">
       <defaultLayer name="Default">
@@ -1124,7 +1124,15 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='Usability%20tools']/@ownedTools[name='DAD_Task'] //@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Tasks%20Graph']/@additionalLayers[name='Actors']/@toolSections.0/@subSections[name='Usability%20tools']/@ownedTools[name='DAD_Actor']" name="Use Case Diagram" titleExpression="aql:self.name + ' Use Case Diagram'" domainClass="graal::UseCase">
       <metamodel href="platform:/plugin/org.obeonetwork.graal/model/graal.ecore#/"/>
-      <layout xsi:type="description_1:CompositeLayout"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.mrtree" label="ELK Mr. Tree" description="Tree-based algorithm provided by the Eclipse Layout Kernel. Computes a spanning tree of the input graph and arranges all nodes according to the resulting parent-children hierarchy. I pity the fool who doesn't use Mr. Tree Layout.">
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="10.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.mrtree.weighting">
+          <targets>PARENT</targets>
+          <value name="MODEL_ORDER"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default" reusedMappings="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Tasks%20Graph']/@defaultLayer/@edgeMappings[name='TG_Use'] //@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Tasks%20Graph']/@defaultLayer/@nodeMappings[name='TG_Task']">
         <containerMappings name="UCD_TasksGroup" deletionDescription="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='Usability%20tools']/@ownedTools[name='UCD_Delete_TasksGroup']" labelDirectEdit="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Reused%20Description']/@defaultLayer/@toolSections.0/@ownedTools[name='Generic%20Edit%20Label']" semanticCandidatesExpression="feature:tasks" domainClass="graal::TasksGroup" reusedNodeMappings="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Tasks%20Graph']/@defaultLayer/@nodeMappings[name='TG_Task']" reusedContainerMappings="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_TasksGroup']">
           <style xsi:type="style:FlatContainerStyleDescription" arcWidth="40" arcHeight="40" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Palette']/@entries[name='ISDBorder']" labelExpression="service:computeGraalLabel" labelColor="//@userColorsPalettes[name='Palette']/@entries[name='ISDLabelAndEdge']" roundedCorner="true">
@@ -1260,6 +1268,22 @@
       <metamodel href="http://www.obeonetwork.org/dsl/environment/3.0.0#/"/>
       <metamodel href="http://www.eclipse.org/sirius/diagram/1.1.0#/"/>
       <metamodel href="http://www.obeonetwork.org/dsl/graal/2.0.0#/"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="15.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="12.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="ORTHOGONAL"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default">
         <containerMappings name="ND_Namespace" detailDescriptions="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='New%20Class%20Diagram']" deletionDescription="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='DEL_ND_Namespace']" labelDirectEdit="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='Namespace%20Name%20Direct%20Edit']" semanticCandidatesExpression="feature:ownedNamespaces" doubleClickDescription="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='Go%20to%20Class%20Diagram']" domainClass="environment.Namespace" dropDescriptions="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='DAD_Namespace']" reusedContainerMappings="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Namespaces%20Hierarchy']/@defaultLayer/@containerMappings[name='ND_Namespace']">
           <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_border']" labelSize="10" labelColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_color']" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_background']" foregroundColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_foreground']">
@@ -1273,7 +1297,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="environment::Namespace" referenceName="ownedNamespaces">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'namespace' + self.eContainer(environment::NamespacesContainer).ownedNamespaces->size()"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'namespace_' + self.eContainer(environment::NamespacesContainer).ownedNamespaces->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -1384,6 +1408,22 @@
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='DAD_ED_DomainClass'] //@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='DAD_ED_Enumeration'] //@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DAD_ED_Namespace'] //@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@additionalLayers[name='External%20Domain%20Classes']/@toolSections.1/@ownedTools[name='DAD_ED_ExternalStructuredType_Referenced']" name="Domain Classes Diagram" label="Domain Classes Diagram" titleExpression="aql:self.name + ' - Domain Classes diagram'" domainClass="environment.Namespace" preconditionExpression="aql:self.ancestors()->filter(graal::System)->notEmpty()">
       <metamodel href="http://www.obeonetwork.org/dsl/environment/3.0.0#/"/>
       <metamodel href="http://www.obeonetwork.org/dsl/graal/2.0.0#/"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="15.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="12.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="ORTHOGONAL"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default">
         <edgeMappings name="ED_Reference_Type_Type" preconditionExpression="aql:self.oppositeOf = null" deletionDescription="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='DEL_Generic']" labelDirectEdit="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='EDT_ED_Reference']" semanticCandidatesExpression="service:diagram.getReferences()" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@defaultLayer/@containerMappings[name='ED_DomainClass'] //@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@additionalLayers[name='External%20Domain%20Classes']/@containerMappings[name='ED_ExternalStructuredType_Referenced']" targetMapping="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@defaultLayer/@containerMappings[name='ED_DomainClass'] //@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@additionalLayers[name='External%20Domain%20Classes']/@containerMappings[name='ED_ExternalStructuredType_Referenced']" targetFinderExpression="feature:referencedType" sourceFinderExpression="feature:containingType" domainClass="environment.Reference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='REC_ED_Reference_Target'] //@ownedViewpoints[name='Graal%20Methodology']/@ownedRepresentations[name='Domain%20Classes%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='REC_ED_Reference_Source']">
           <style strokeColor="//@userColorsPalettes[name='Palette']/@entries[name='ISDLabelAndEdge']" targetArrow="NoDecoration">
diff --git a/designs/soa/plugins/org.obeonetwork.dsl.soa.design/description/soa.odesign b/designs/soa/plugins/org.obeonetwork.dsl.soa.design/description/soa.odesign
index 0adba8f86..464c0d0ef 100644
--- a/designs/soa/plugins/org.obeonetwork.dsl.soa.design/description/soa.odesign
+++ b/designs/soa/plugins/org.obeonetwork.dsl.soa.design/description/soa.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:properties="http://www.eclipse.org/sirius/properties/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" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" documentation="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="Soa" version="12.0.0.2017041100">
+<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:properties="http://www.eclipse.org/sirius/properties/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" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" documentation="Copyright (c) 2008, 2026 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v2.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;https://www.eclipse.org/legal/epl-2.0/&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;   Obeo - initial API and implementation" name="Soa" version="15.4.0.202401051836">
   <ownedViewpoints endUserDocumentation="The &lt;b>SOA Views&lt;/b> viewpoint provides four representations : &#xD;&#xA;&lt;ul>&#xD;&#xA;&lt;li>&lt;b>Component Contract Diagram&lt;/b> : a diagram allowing to represent and edit the required and provided Services of a Component,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>DTO Diagram&lt;/b> : a diagram allowing to represent and edit the DTOs of a Namespace,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>DTO Namespaces Hierarchy&lt;/b> : a diagram allowing to represent and edit the Namespace hierarchy of a System,&lt;/li>&#xD;&#xA;&lt;li>&lt;b>SOA Diagram&lt;/b> : a diagram allowing to represent and edit the Components of a System.&lt;/li>&#xD;&#xA;&lt;/ul>&#xA;" name="SOA Views" modelFileExtension="soa ois">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='SOA%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='Usability%20Tools']/@ownedTools[name='DAD_Component'] //@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='SOA%20Diagram']/@additionalLayers[name='External%20Components']/@toolSections.0/@ownedTools[name='DND_SOAD_Referenced_External_Component']" name="SOA Diagram" titleExpression="aql:self.name + ' SOA Diagram'" domainClass="soa::System">
       <metamodel href="platform:/plugin/org.obeonetwork.dsl.environment/model/environment.ecore#/"/>
@@ -246,6 +246,7 @@
           <audits auditExpression="aql:OrderedSet{'return', 'public', 'private', 'protected', 'class', 'interface', 'package', 'extends', 'implements', 'int', 'double', 'float'}->excludes(self.name)"/>
         </ownedRules>
       </validationSet>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.box" label="ELK Box" description="Algorithm for packing of unconnected boxes, i.e. graphs without edges."/>
       <defaultLayer name="Default Layer">
         <containerMappings name="Cc_ServiceInterface_CM" deletionDescription="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='Component%20Contract%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='Usability%20tools']/@ownedTools[name='CCD_DEL_Unsynchronizables']" labelDirectEdit="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='Reused%20Tools']/@defaultLayer/@toolSections.0/@ownedTools[name='Reused%20Name%20Direct%20Edit']" semanticCandidatesExpression="feature:ownedServices" domainClass="soa.Service" dropDescriptions="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='Component%20Contract%20Diagram']/@defaultLayer/@toolSections.1/@subSections[name='Usability%20tools']/@ownedTools[name='DAD_Operation']">
           <subContainerMappings name="Cc_Operation_CM" deletionDescription="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='Component%20Contract%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='Usability%20tools']/@ownedTools[name='CCD_DEL_Unsynchronizables']" labelDirectEdit="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='Reused%20Tools']/@defaultLayer/@toolSections.0/@ownedTools[name='Reused%20Name%20Direct%20Edit']" semanticCandidatesExpression="aql:self.ownedInterface.ownedOperations" domainClass="soa.Operation" childrenPresentation="List">
@@ -506,6 +507,22 @@
       <metamodel href="http://www.obeonetwork.org/dsl/environment/3.0.0#/"/>
       <metamodel href="http://www.eclipse.org/sirius/diagram/1.1.0#/"/>
       <metamodel href="http://www.obeonetwork.org/dsl/soa/4.0.0#/"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="15.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="12.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="ORTHOGONAL"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default">
         <containerMappings name="ND_Namespace" detailDescriptions="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='New%20Class%20Diagram']" deletionDescription="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='DEL_ND_Namespace']" labelDirectEdit="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='Namespace%20Name%20Direct%20Edit']" semanticCandidatesExpression="feature:ownedNamespaces" doubleClickDescription="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='Go%20to%20Class%20Diagram']" domainClass="environment.Namespace" dropDescriptions="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Namespaces%20Hierarchy']/@defaultLayer/@toolSections.1/@ownedTools[name='DAD_Namespace']" reusedContainerMappings="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Namespaces%20Hierarchy']/@defaultLayer/@containerMappings[name='ND_Namespace']">
           <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_border']" labelSize="10" labelColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_color']" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_background']" foregroundColor="//@userColorsPalettes[name='Palette']/@entries[name='Namespace_foreground']">
@@ -519,7 +536,7 @@
             <initialOperation>
               <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
                 <subModelOperations xsi:type="tool_1:CreateInstance" typeName="environment::Namespace" referenceName="ownedNamespaces">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'namespace' + self.eContainer(environment::NamespacesContainer).ownedNamespaces->size()"/>
+                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'namespace_' + self.eContainer(environment::NamespacesContainer).ownedNamespaces->size()"/>
                 </subModelOperations>
               </firstModelOperations>
             </initialOperation>
@@ -637,6 +654,22 @@
     <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='DAD_DD_DTO'] //@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='DAD_ED_Enumeration'] //@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DAD_ED_Namespace'] //@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@additionalLayers[name='External%20DTOs']/@toolSections.1/@ownedTools[name='DAD_ED_ExternalStructuredType_Referenced']" name="DTO Diagram" label="DTO Diagram" titleExpression="aql:self.name + ' - DTO diagram'" domainClass="environment.Namespace" preconditionExpression="aql:self.ancestors()->filter(soa::System)->notEmpty()">
       <metamodel href="http://www.obeonetwork.org/dsl/environment/3.0.0#/"/>
       <metamodel href="http://www.obeonetwork.org/dsl/soa/4.0.0#/"/>
+      <layout xsi:type="description_1:CustomLayoutConfiguration" id="org.eclipse.elk.layered" label="ELK Layered" description="Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level.">
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeNode" value="15.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.spacing.edgeEdge" value="12.0">
+          <targets>PARENT</targets>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
+          <targets>PARENT</targets>
+          <value name="DOWN"/>
+        </layoutOptions>
+        <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.edgeRouting">
+          <targets>PARENT</targets>
+          <value name="ORTHOGONAL"/>
+        </layoutOptions>
+      </layout>
       <defaultLayer name="Default">
         <edgeMappings name="ED_Reference_Type_Type" preconditionExpression="aql:self.oppositeOf = null" deletionDescription="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='DEL_Generic']" labelDirectEdit="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='EDT_ED_Reference']" semanticCandidatesExpression="service:diagram.getReferences()" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@defaultLayer/@containerMappings[name='DD_DTO'] //@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@additionalLayers[name='External%20DTOs']/@containerMappings[name='ED_ExternalStructuredType_Referenced']" targetMapping="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@defaultLayer/@containerMappings[name='DD_DTO'] //@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@additionalLayers[name='External%20DTOs']/@containerMappings[name='ED_ExternalStructuredType_Referenced']" targetFinderExpression="feature:referencedType" sourceFinderExpression="feature:containingType" domainClass="environment.Reference" useDomainElement="true" reconnections="//@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='REC_ED_Reference_Target'] //@ownedViewpoints[name='SOA%20Views']/@ownedRepresentations[name='DTO%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='REC_ED_Reference_Source']">
           <style strokeColor="//@userColorsPalettes[name='Palette']/@entries[name='ISDLabelAndEdge']" targetArrow="NoDecoration">
diff --git a/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.target b/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.target
index 11bf619b3..e747c3e08 100644
--- a/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.target
+++ b/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="IS Designer Product Target Definition" sequenceNumber="1784194623">
+<target name="IS Designer Product Target Definition" sequenceNumber="1784886806">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
@@ -93,10 +93,6 @@
       <unit id="org.hamcrest.library" version="0.0.0"/>
       <unit id="org.objectweb.asm" version="0.0.0"/>
       <unit id="org.objectweb.asm.tree" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.diagram.elk.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.diagram.elk.feature.source.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.diagram.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.diagram.elk.sdk.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.doc.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.interpreter.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.interpreter.feature.source.feature.group" version="0.0.0"/>
@@ -109,6 +105,10 @@
       <unit id="com.google.guava" version="0.0.0"/>
       <unit id="fr.obeo.dsl.designer.ce.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram.elk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram.elk.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram.elk.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram.elk.sdk.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.properties.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.properties.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
diff --git a/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.tpd b/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.tpd
index b5ccfbbf7..d1ce92d67 100644
--- a/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.tpd
+++ b/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isdesigner.tpd
@@ -70,10 +70,6 @@ location Obeo-Designer-Community-12.0 "https://update.obeo.fr/release/designer/1
 	org.objectweb.asm lazy
 	org.objectweb.asm.tree lazy
 	// Sirius
-	org.eclipse.sirius.diagram.elk.feature.feature.group lazy
-	org.eclipse.sirius.diagram.elk.feature.source.feature.group lazy
-	org.eclipse.sirius.diagram.elk.sdk.feature.feature.group lazy
-	org.eclipse.sirius.diagram.elk.sdk.feature.source.feature.group lazy
 	org.eclipse.sirius.doc.feature.feature.group lazy
 	org.eclipse.sirius.interpreter.feature.feature.group lazy
 	org.eclipse.sirius.interpreter.feature.source.feature.group lazy
diff --git a/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isrepository.target b/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isrepository.target
index 1ad64a28a..246adc180 100644
--- a/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isrepository.target
+++ b/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isrepository.target
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="IS Designer Repository Target Definition" sequenceNumber="1784194570">
+<target name="IS Designer Repository Target Definition" sequenceNumber="1784886804">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="com.google.guava" version="0.0.0"/>
       <unit id="fr.obeo.dsl.designer.ce.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram.elk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram.elk.feature.source.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram.elk.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.diagram.elk.sdk.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.properties.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.properties.feature.source.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
diff --git a/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isrepository.tpd b/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isrepository.tpd
index be6e35e2a..be38354d3 100644
--- a/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isrepository.tpd
+++ b/is-designer/releng/org.obeonetwork.is.designer.parent/target_platform/isrepository.tpd
@@ -5,6 +5,10 @@ location Obeo-Designer-Community-12.0 "https://update.obeo.fr/release/designer/1
 	fr.obeo.dsl.designer.ce.feature.feature.group lazy
 	org.eclipse.emf.compare.ide.ui.feature.group lazy
 	// Sirius
+	org.eclipse.sirius.diagram.elk.feature.feature.group lazy
+	org.eclipse.sirius.diagram.elk.feature.source.feature.group lazy
+	org.eclipse.sirius.diagram.elk.sdk.feature.feature.group lazy
+	org.eclipse.sirius.diagram.elk.sdk.feature.source.feature.group lazy
 	org.eclipse.sirius.properties.feature.feature.group lazy
 	org.eclipse.sirius.properties.feature.source.feature.group lazy
 	org.eclipse.sirius.runtime.aql.feature.group lazy