[507616] Add mapping information usage when pasting format

- Added new interface
org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMappingcontaining
methods to handle copy/paste format with mapping information
- Makes methods
org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManager.getFormatData(FormatDataKey)
and
org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManager.addFormatData(FormatDataKey,
AbstractFormatData) deprecated. Now, methods of
SiriusFormatDataManagerWithMappingcontaining must be used
- Updated
org.eclipse.sirius.diagram.ui.tools.api.format.AbstractSiriusFormatDataManager
to use the new method when this implements
SiriusFormatDataManagerWithMappingcontaining
- Copy/paste format will now use mapping information when more than one
data format is associated to diagram element key.
- Updated tests to work with the new methods.

Bug: 507616
Change-Id: I182b36d3c6c9ef8580a342621413eb3174bd64f8
Signed-off-by: pguilet <pierre.guilet@obeo.fr>

14 files changed, 4001 insertions, 3360 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/AbstractSiriusFormatDataManager.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/AbstractSiriusFormatDataManager.java
index 4fecd0eb94..f8e93c5273 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/AbstractSiriusFormatDataManager.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/AbstractSiriusFormatDataManager.java
@@ -81,6 +81,7 @@ import org.eclipse.sirius.diagram.ui.internal.refresh.borderednode.CanonicalDBor
 import org.eclipse.sirius.diagram.ui.provider.Messages;
 import org.eclipse.sirius.diagram.ui.tools.api.graphical.edit.styles.IBorderItemOffsets;
 import org.eclipse.sirius.ext.draw2d.figure.FigureUtilities;
+import org.eclipse.sirius.viewpoint.DRepresentationElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.Style;
 import org.eclipse.sirius.viewpoint.ViewpointPackage;
@@ -93,7 +94,11 @@ import com.google.common.collect.Sets;
 /**
  * An abstract implementation for {@link SiriusFormatDataManager}. <BR>
  * Provide a method to store a format from a graphicalEditPart and iterates on
- * it's children.
+ * it's children and apply a format.
+ * 
+ * Regarding the store/apply format functionality, the subclass of this should
+ * implements {@link SiriusFormatDataManagerWithMapping} that handles more cases
+ * thanks to mapping information.
  *
  * @author <a href="mailto:laurent.redor@obeo.fr">Laurent Redor</a>
  *
@@ -118,7 +123,7 @@ public abstract class AbstractSiriusFormatDataManager implements SiriusFormatDat
             addChildFormat((DDiagram) semanticElement, rootEditPart, discoveredKeys);
         } else if (toStoreView instanceof Node) {
             if (semanticElement instanceof DDiagramElement && semanticElement instanceof DSemanticDecorator) {
-                addChildFormat(null, (DSemanticDecorator) semanticElement, (Node) toStoreView, rootEditPart, discoveredKeys);
+                addChildFormat(null, (DDiagramElement) semanticElement, (Node) toStoreView, rootEditPart, discoveredKeys);
             }
         }
         discoveredKeys.clear();
@@ -178,7 +183,7 @@ public abstract class AbstractSiriusFormatDataManager implements SiriusFormatDat
             centerEdgesEnds(toStoreView);
         } else if (toStoreView instanceof Node) {
             if (semanticElement instanceof DDiagramElement && semanticElement instanceof DSemanticDecorator) {
-                applyFormat((DSemanticDecorator) semanticElement, (Node) toStoreView, rootEditPart.getRoot().getViewer(), null, applyFormat, applyStyle);
+                applyFormat((DDiagramElement) semanticElement, (Node) toStoreView, rootEditPart.getRoot().getViewer(), null, applyFormat, applyStyle);
             }
             centerEdgesEnds(toStoreView);
         }
@@ -235,7 +240,13 @@ public abstract class AbstractSiriusFormatDataManager implements SiriusFormatDat
      * @param editPartViewer
      */
     private void applyFormat(final DEdge edge, final Edge gmfEdge, final EditPartViewer editPartViewer, boolean applyFormat, boolean applyStyle) {
-        final EdgeFormatData formatData = (EdgeFormatData) getFormatData(createKey(edge));
+        final EdgeFormatData formatData;
+        if (this instanceof SiriusFormatDataManagerWithMapping) {
+            formatData = (EdgeFormatData) ((SiriusFormatDataManagerWithMapping) this).getFormatData(createKey(edge), edge.getMapping());
+        } else {
+            formatData = (EdgeFormatData) getFormatData(createKey(edge));
+        }
+
         if (formatData != null) {
             if (applyFormat) {
                 final Bendpoints bendpoints = convertPointsToGMFBendpoint(formatData);
@@ -352,11 +363,15 @@ public abstract class AbstractSiriusFormatDataManager implements SiriusFormatDat
      *            The viewer responsible for the current editparts lifecycle.
      * @parentFormatData the format of the parent of <code>toRestoreView<code>
      */
-    private void applyFormat(final DSemanticDecorator semanticDecorator, final Node toRestoreView, final EditPartViewer editPartViewer, final NodeFormatData parentFormatData, boolean applyFormat,
+    private void applyFormat(final DRepresentationElement semanticDecorator, final Node toRestoreView, final EditPartViewer editPartViewer, final NodeFormatData parentFormatData, boolean applyFormat,
             boolean applyStyle) {
         FormatDataKey key = createKey(semanticDecorator);
-        NodeFormatData formatData = (NodeFormatData) getFormatData(key);
-
+        NodeFormatData formatData;
+        if (this instanceof SiriusFormatDataManagerWithMapping) {
+            formatData = (NodeFormatData) ((SiriusFormatDataManagerWithMapping) this).getFormatData(key, semanticDecorator.getMapping());
+        } else {
+            formatData = (NodeFormatData) getFormatData(key);
+        }
         // If a direct child have the same format data and key than its parents,
         // look in the parent format data 's children for a child format data
         // with the expected id.
@@ -582,7 +597,12 @@ public abstract class AbstractSiriusFormatDataManager implements SiriusFormatDat
             final Node gmfNode = SiriusGMFHelper.getGmfNode(child);
             if (gmfNode != null) {
                 FormatDataKey key = createKey(child);
-                NodeFormatData formatData = (NodeFormatData) getFormatData(key);
+                NodeFormatData formatData;
+                if (this instanceof SiriusFormatDataManagerWithMapping) {
+                    formatData = (NodeFormatData) ((SiriusFormatDataManagerWithMapping) this).getFormatData(key, child.getMapping());
+                } else {
+                    formatData = (NodeFormatData) getFormatData(key);
+                }
 
                 // If a direct child have the same format data and key than its
                 // parents, look in the parent format data 's children for a
@@ -881,7 +901,7 @@ public abstract class AbstractSiriusFormatDataManager implements SiriusFormatDat
      * @param editPart
      *            The editPart corresponding to the new format
      */
-    private void addChildFormat(final NodeFormatData parentFormatData, final DSemanticDecorator child, final Node gmfNode, final IGraphicalEditPart editPart,
+    private void addChildFormat(final NodeFormatData parentFormatData, final DRepresentationElement child, final Node gmfNode, final IGraphicalEditPart editPart,
             final Collection<FormatDataKey> discoveredKeys) {
         final NodeFormatData childFormatData = FormatDataHelper.INSTANCE.createNodeFormatData(gmfNode, editPart, parentFormatData);
         if (parentFormatData != null) {
@@ -895,13 +915,21 @@ public abstract class AbstractSiriusFormatDataManager implements SiriusFormatDat
         // inspected node, the previously computed data might be replaced. It
         // could so replaced one of the initially selected parts.
         if (!discoveredKeys.contains(childKey)) {
-            addFormatData(childKey, childFormatData);
+            if (this instanceof SiriusFormatDataManagerWithMapping) {
+                ((SiriusFormatDataManagerWithMapping) this).addFormatData(childKey, child.getMapping(), childFormatData);
+            } else {
+                addFormatData(childKey, childFormatData);
+            }
             discoveredKeys.add(childKey);
         } else if (parentFormatData == null) {
             // In this case, the same key is used for a root format data and for
             // an other view (child or border of an other view), the root data
             // should be stored.
-            addFormatData(childKey, childFormatData);
+            if (this instanceof SiriusFormatDataManagerWithMapping) {
+                ((SiriusFormatDataManagerWithMapping) this).addFormatData(childKey, child.getMapping(), childFormatData);
+            } else {
+                addFormatData(childKey, childFormatData);
+            }
         }
 
         if (child instanceof DNode) {
@@ -957,7 +985,11 @@ public abstract class AbstractSiriusFormatDataManager implements SiriusFormatDat
             edgeFormatData.setId(edgeKey.getId());
 
             // Add the edge format data.
-            addFormatData(edgeKey, edgeFormatData);
+            if (this instanceof SiriusFormatDataManagerWithMapping) {
+                ((SiriusFormatDataManagerWithMapping) this).addFormatData(edgeKey, edge.getMapping(), edgeFormatData);
+            } else {
+                addFormatData(edgeKey, edgeFormatData);
+            }
             // Add the label format data (if exists).
             addLabelFormatData(edgeFormatData, gmfEdge);
         }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/SiriusFormatDataManager.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/SiriusFormatDataManager.java
index 86e2e8ce6d..aff0ccb45d 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/SiriusFormatDataManager.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/SiriusFormatDataManager.java
@@ -29,7 +29,11 @@ public interface SiriusFormatDataManager {
      * @param key
      *            The key
      * @return the format data corresponding to the key or null if not found.
+     * @deprecated Replaced by
+     *             {@link SiriusFormatDataManagerWithMapping#getFormatData(FormatDataKey, org.eclipse.sirius.viewpoint.description.RepresentationElementMapping)}
+     *             handling more copy/paste cases by using mapping information.
      */
+    @Deprecated
     AbstractFormatData getFormatData(final FormatDataKey key);
 
     /**
@@ -39,7 +43,11 @@ public interface SiriusFormatDataManager {
      *            The key
      * @param formatData
      *            The format data
+     * @deprecated Replaced by
+     *             {@link SiriusFormatDataManagerWithMapping#addFormatData(FormatDataKey, org.eclipse.sirius.viewpoint.description.RepresentationElementMapping, AbstractFormatData)}
+     *             handling more copy/paste cases by using mapping information.
      */
+    @Deprecated
     void addFormatData(final FormatDataKey key, final AbstractFormatData formatData);
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/SiriusFormatDataManagerWithMapping.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/SiriusFormatDataManagerWithMapping.java
new file mode 100644
index 0000000000..6d96529a37
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/format/SiriusFormatDataManagerWithMapping.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2016 THALES GLOBAL SERVICES.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.diagram.ui.tools.api.format;
+
+import org.eclipse.sirius.diagram.formatdata.AbstractFormatData;
+import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
+
+/**
+ * An interface extending {@link SiriusFormatDataManager} to add the capacity to
+ * get formats during format pasting by taking in consideration the key and the
+ * mapping when more than one formats are associated to the key.
+ * 
+ * @author <a href="mailto:pierre.guilet@obeo.fr">Pierre Guilet</a>
+ *
+ */
+public interface SiriusFormatDataManagerWithMapping extends SiriusFormatDataManager {
+
+    /**
+     * Get the format data with the best corresponding to the key.
+     * 
+     * @param key
+     *            The key
+     * @param mapping
+     *            the mapping used to discriminate returned
+     *            {@link AbstractFormatData} when the key is attached to more
+     *            than one format.
+     * @return the format data corresponding to the key or null if not found.
+     */
+    AbstractFormatData getFormatData(final FormatDataKey key, RepresentationElementMapping mapping);
+
+    /**
+     * Add a format data according to the key and the mapping information.
+     * 
+     * @param key
+     *            The key
+     * @param mapping
+     *            the mapping used to discriminate returned
+     *            {@link AbstractFormatData} when the key is attached to more
+     *            than one format.
+     * @param formatData
+     *            The format data associated to the key and mapping.
+     */
+    void addFormatData(final FormatDataKey key, RepresentationElementMapping mapping, final AbstractFormatData formatData);
+
+}
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/format/AdvancedSiriusFormatDataManager.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/format/AdvancedSiriusFormatDataManager.java
index d0c6f3af8a..a3065b2aa3 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/format/AdvancedSiriusFormatDataManager.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/format/AdvancedSiriusFormatDataManager.java
@@ -14,8 +14,8 @@ import java.util.Map;
 
 import org.eclipse.sirius.diagram.formatdata.EdgeFormatData;
 import org.eclipse.sirius.diagram.formatdata.NodeFormatData;
-import org.eclipse.sirius.diagram.ui.tools.api.format.FormatDataKey;
-import org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManager;
+import org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping;
+import org.eclipse.sirius.diagram.ui.tools.internal.format.semantic.SemanticEdgeFormatDataKey;
 
 /**
  * Interface to manage
@@ -24,7 +24,7 @@ import org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManager;
  * 
  * @author dlecan
  */
-public interface AdvancedSiriusFormatDataManager extends SiriusFormatDataManager {
+public interface AdvancedSiriusFormatDataManager extends SiriusFormatDataManagerWithMapping {
 
     /**
      * Get only root node format data, that is to say only the format data
@@ -32,20 +32,20 @@ public interface AdvancedSiriusFormatDataManager extends SiriusFormatDataManager
      * 
      * @return Map.
      */
-    Map<? extends FormatDataKey, ? extends NodeFormatData> getRootNodeFormatData();
+    Map<? extends NodeFormatDataKey, Map<String, NodeFormatData>> getRootNodeFormatData();
 
     /**
      * Get node format data.
      * 
      * @return Map.
      */
-    Map<? extends NodeFormatDataKey, NodeFormatData> getNodeFormatData();
+    Map<? extends NodeFormatDataKey, Map<String, NodeFormatData>> getNodeFormatData();
 
     /**
      * Get edge format data.
      * 
      * @return Map.
      */
-    Map<? extends EdgeFormatDataKey, EdgeFormatData> getEdgeFormatData();
+    Map<SemanticEdgeFormatDataKey, Map<String, EdgeFormatData>> getEdgeFormatData();
 
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/format/semantic/SiriusFormatDataManagerForSemanticElements.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/format/semantic/SiriusFormatDataManagerForSemanticElements.java
index cfe85c24a6..ab6e9aac76 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/format/semantic/SiriusFormatDataManagerForSemanticElements.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/format/semantic/SiriusFormatDataManagerForSemanticElements.java
@@ -12,6 +12,9 @@ package org.eclipse.sirius.diagram.ui.tools.internal.format.semantic;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.diagram.AbstractDNode;
@@ -21,11 +24,15 @@ import org.eclipse.sirius.diagram.formatdata.AbstractFormatData;
 import org.eclipse.sirius.diagram.formatdata.EdgeFormatData;
 import org.eclipse.sirius.diagram.formatdata.NodeFormatData;
 import org.eclipse.sirius.diagram.ui.tools.api.format.AbstractSiriusFormatDataManager;
-import org.eclipse.sirius.diagram.ui.tools.api.format.FormatDataHelper;
 import org.eclipse.sirius.diagram.ui.tools.api.format.FormatDataKey;
 import org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManager;
 import org.eclipse.sirius.diagram.ui.tools.internal.format.AdvancedSiriusFormatDataManager;
+import org.eclipse.sirius.diagram.ui.tools.internal.format.NodeFormatDataKey;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
+import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Maps;
 
 /**
  * SiriusFormatDataManager drives by the semantic elements (EObject). Use for
@@ -36,11 +43,47 @@ import org.eclipse.sirius.viewpoint.DSemanticDecorator;
  */
 public class SiriusFormatDataManagerForSemanticElements extends AbstractSiriusFormatDataManager implements AdvancedSiriusFormatDataManager {
 
+    /**
+     * Error message used when this manager is added an
+     * {@link AbstractFormatData} which specific type is not supported.
+     */
+    private static final String ERROR_MESSAGE_UNSUPPORTED_FORMAT_DATA_TYPE = "The default format data manager SiriusFormatDataManagerForSemanticElements does not support AbstractDataFormat of the type :"; //$NON-NLS-1$
+
+    /**
+     * Error message used when this format data manager is called by the
+     * obsolete method
+     * org.eclipse.sirius.diagram.ui.tools.internal.format.semantic.
+     * SiriusFormatDataManagerForSemanticElements.addFormatData(FormatDataKey,
+     * AbstractFormatData) or
+     * org.eclipse.sirius.diagram.ui.tools.internal.format.semantic.
+     * SiriusFormatDataManagerForSemanticElements.getFormatData(FormatDataKey).
+     */
+    private static final String ERROR_MESSAGE_UNSUPPORTED_METHOD_CALL = "The default SiriusFormatDataManager does not use this method anymore"; //$NON-NLS-1$
+
     private static final SiriusFormatDataManagerForSemanticElements INSTANCE = new SiriusFormatDataManagerForSemanticElements();
 
-    private final Map<SemanticNodeFormatDataKey, NodeFormatData> nodeFormatDataMap = new HashMap<SemanticNodeFormatDataKey, NodeFormatData>();
+    private static final Predicate<EObject> ROOT_PREDICATE = new Predicate<EObject>() {
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean apply(final EObject input) {
+            return input.eContainer() == null;
+        }
+    };
+
+    /**
+     * The map containing node formats associated to its mapping id and indexed
+     * by the key as {@link SemanticNodeFormatDataKey}.
+     */
+    private final Map<SemanticNodeFormatDataKey, Map<String, NodeFormatData>> nodeFormatDataMap = new HashMap<SemanticNodeFormatDataKey, Map<String, NodeFormatData>>();
 
-    private final Map<SemanticEdgeFormatDataKey, EdgeFormatData> edgeFormatDataMap = new HashMap<SemanticEdgeFormatDataKey, EdgeFormatData>();
+    /**
+     * The map containing edge formats associated to its mapping id and indexed
+     * by the key as {@link SemanticEdgeFormatDataKey}.
+     */
+    private final Map<SemanticEdgeFormatDataKey, Map<String, EdgeFormatData>> edgeFormatDataMap = new HashMap<SemanticEdgeFormatDataKey, Map<String, EdgeFormatData>>();
 
     /**
      * Default constructor.
@@ -57,6 +100,12 @@ public class SiriusFormatDataManagerForSemanticElements extends AbstractSiriusFo
      */
     @Override
     public void addFormatData(final FormatDataKey key, final AbstractFormatData formatData) {
+        clearFormatData();
+        throw new UnsupportedOperationException(ERROR_MESSAGE_UNSUPPORTED_METHOD_CALL);
+    }
+
+    @Override
+    public void addFormatData(FormatDataKey key, RepresentationElementMapping mapping, AbstractFormatData formatData) {
         if (!checkKeyType(key)) {
             // Kind of key not manage
             formatData.setId(null);
@@ -65,17 +114,32 @@ public class SiriusFormatDataManagerForSemanticElements extends AbstractSiriusFo
 
         if (key instanceof SemanticNodeFormatDataKey) {
             if (formatData instanceof NodeFormatData) {
-                nodeFormatDataMap.put((SemanticNodeFormatDataKey) key, (NodeFormatData) formatData);
+                Map<String, NodeFormatData> formatsMap = nodeFormatDataMap.get(key);
+                if (formatsMap == null) {
+                    formatsMap = new TreeMap<String, NodeFormatData>();
+                    nodeFormatDataMap.put((SemanticNodeFormatDataKey) key, formatsMap);
+                }
+
+                formatsMap.put(mapping.getName(), (NodeFormatData) formatData);
             } else {
-                // Bad type of formatData for this key
+                clearFormatData();
+                throw new IllegalStateException(ERROR_MESSAGE_UNSUPPORTED_FORMAT_DATA_TYPE + formatData.getClass().getSimpleName());
             }
         } else if (key instanceof SemanticEdgeFormatDataKey) {
             if (formatData instanceof EdgeFormatData) {
-                edgeFormatDataMap.put((SemanticEdgeFormatDataKey) key, (EdgeFormatData) formatData);
+                Map<String, EdgeFormatData> formatsMap = edgeFormatDataMap.get(key);
+                if (formatsMap == null) {
+                    formatsMap = new TreeMap<String, EdgeFormatData>();
+                    edgeFormatDataMap.put((SemanticEdgeFormatDataKey) key, formatsMap);
+                }
+
+                formatsMap.put(mapping.getName(), (EdgeFormatData) formatData);
             } else {
-                // Bad type of formatData for this key
+                clearFormatData();
+                throw new IllegalStateException(ERROR_MESSAGE_UNSUPPORTED_FORMAT_DATA_TYPE + formatData.getClass().getSimpleName());
             }
         }
+
     }
 
     /**
@@ -85,12 +149,36 @@ public class SiriusFormatDataManagerForSemanticElements extends AbstractSiriusFo
      */
     @Override
     public AbstractFormatData getFormatData(final FormatDataKey key) {
+        clearFormatData();
+        throw new UnsupportedOperationException(ERROR_MESSAGE_UNSUPPORTED_METHOD_CALL);
+    }
+
+    @Override
+    public AbstractFormatData getFormatData(FormatDataKey key, RepresentationElementMapping mapping) {
         AbstractFormatData result = null;
         if (checkKeyType(key)) {
+            String mappingName = mapping == null ? null : mapping.getName();
             if (key instanceof SemanticNodeFormatDataKey) {
-                result = nodeFormatDataMap.get(key);
+                Map<String, NodeFormatData> formatsMap = nodeFormatDataMap.get(key);
+                if (formatsMap != null) {
+                    NodeFormatData nodeFormatData = formatsMap.get(mappingName);
+                    if (nodeFormatData == null && formatsMap.size() > 0) {
+                        result = formatsMap.values().iterator().next();
+                    } else {
+                        result = nodeFormatData;
+                    }
+                }
+
             } else if (key instanceof SemanticEdgeFormatDataKey) {
-                result = edgeFormatDataMap.get(key);
+                Map<String, EdgeFormatData> formatsMap = edgeFormatDataMap.get(key);
+                if (formatsMap != null) {
+                    EdgeFormatData edgeFormatData = formatsMap.get(mappingName);
+                    if (edgeFormatData == null && formatsMap.size() > 0) {
+                        result = formatsMap.values().iterator().next();
+                    } else {
+                        result = edgeFormatData;
+                    }
+                }
             }
         }
         return result;
@@ -158,7 +246,7 @@ public class SiriusFormatDataManagerForSemanticElements extends AbstractSiriusFo
      * {@inheritDoc}
      */
     @Override
-    public Map<SemanticEdgeFormatDataKey, EdgeFormatData> getEdgeFormatData() {
+    public Map<SemanticEdgeFormatDataKey, Map<String, EdgeFormatData>> getEdgeFormatData() {
         return edgeFormatDataMap;
     }
 
@@ -166,15 +254,32 @@ public class SiriusFormatDataManagerForSemanticElements extends AbstractSiriusFo
      * {@inheritDoc}
      */
     @Override
-    public Map<? extends FormatDataKey, ? extends NodeFormatData> getRootNodeFormatData() {
-        return (Map<? extends FormatDataKey, ? extends NodeFormatData>) FormatDataHelper.INSTANCE.getRootFormatData(nodeFormatDataMap);
+    public Map<? extends NodeFormatDataKey, Map<String, NodeFormatData>> getRootNodeFormatData() {
+        return getRootFormatData(nodeFormatDataMap);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Map<? extends NodeFormatDataKey, Map<String, NodeFormatData>> getRootFormatData(final Map<SemanticNodeFormatDataKey, Map<String, NodeFormatData>> theNodeFormatDataMap) {
+        Map<NodeFormatDataKey, Map<String, NodeFormatData>> resultValues = new HashMap<NodeFormatDataKey, Map<String, NodeFormatData>>();
+        Set<Entry<SemanticNodeFormatDataKey, Map<String, NodeFormatData>>> allEntries = theNodeFormatDataMap.entrySet();
+        for (Entry<SemanticNodeFormatDataKey, Map<String, NodeFormatData>> entry : allEntries) {
+            Map<String, NodeFormatData> value = entry.getValue();
+            Map<String, NodeFormatData> filterValues = Maps.filterValues(value, ROOT_PREDICATE);
+            if (filterValues.size() > 0) {
+                resultValues.put(entry.getKey(), filterValues);
+            }
+        }
+        return resultValues;
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public Map<SemanticNodeFormatDataKey, NodeFormatData> getNodeFormatData() {
+    public Map<? extends NodeFormatDataKey, Map<String, NodeFormatData>> getNodeFormatData() {
         return nodeFormatDataMap;
     }
+
 }
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 99d65051f4..4455999c4b 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -13,13 +13,21 @@
 				<a href="#ReleaseNotesforSirius">Release Notes for Sirius</a>
 				<ol style="list-style: disc;">
 					<li>
+						<a href="#sirius4.1.2">Changes in Sirius 4.1.2</a>
+						<ol style="list-style: disc;">
+							<li>
+								<a href="#DeveloperVisibleChanges">Developer-Visible Changes</a>
+							</li>
+						</ol>
+					</li>
+					<li>
 						<a href="#sirius4.1.1">Changes in Sirius 4.1.1</a>
 						<ol style="list-style: disc;">
 							<li>
 								<a href="#UserVisibleChanges">User-Visible Changes</a>
 							</li>
 							<li>
-								<a href="#DeveloperVisibleChanges">Developer-Visible Changes</a>
+								<a href="#DeveloperVisibleChanges2">Developer-Visible Changes</a>
 							</li>
 						</ol>
 					</li>
@@ -33,7 +41,7 @@
 								<a href="#SpecifierVisibleChanges">Specifier-Visible Changes</a>
 							</li>
 							<li>
-								<a href="#DeveloperVisibleChanges2">Developer-Visible Changes</a>
+								<a href="#DeveloperVisibleChanges3">Developer-Visible Changes</a>
 							</li>
 						</ol>
 					</li>
@@ -47,7 +55,7 @@
 								<a href="#SpecifierVisibleChanges2">Specifier-Visible Changes</a>
 							</li>
 							<li>
-								<a href="#DeveloperVisibleChanges3">Developer-Visible Changes</a>
+								<a href="#DeveloperVisibleChanges4">Developer-Visible Changes</a>
 							</li>
 						</ol>
 					</li>
@@ -61,7 +69,7 @@
 								<a href="#SpecifierVisibleChanges3">Specifier-Visible Changes</a>
 							</li>
 							<li>
-								<a href="#DeveloperVisibleChanges4">Developer-Visible Changes</a>
+								<a href="#DeveloperVisibleChanges5">Developer-Visible Changes</a>
 							</li>
 						</ol>
 					</li>
@@ -75,7 +83,7 @@
 								<a href="#SpecifierVisibleChanges4">Specifier-Visible Changes</a>
 							</li>
 							<li>
-								<a href="#DeveloperVisibleChanges5">Developer-Visible Changes</a>
+								<a href="#DeveloperVisibleChanges6">Developer-Visible Changes</a>
 							</li>
 						</ol>
 					</li>
@@ -85,12 +93,43 @@
 		<p>This document contains the release notes for recent major releases of Sirius. See also 
 			<a href="Release_Notes_Previous.html">the release notes from previous versions</a> for details about older releases.
 		</p>
+		<h2 id="sirius4.1.2">Changes in Sirius 4.1.2</h2>
+		<h3 id="DeveloperVisibleChanges">Developer-Visible Changes</h3>
+		<ul>
+			<li><span class="label label-success">Added</span> 
+				<code>org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping</code> class has  been added to handle copy/paste format with mapping information when an element target of a format pasting has many source diagram format corresponding to its key. In this case, we use the mapping information to get the more precise data format. And if no result matched, then we return the first found by using the key.
+			</li>
+		</ul>
+		<ul>
+			<li><span class="label label-success">Added</span> 
+				<code>org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping.getFormatData(FormatDataKey, RepresentationElementMapping)</code> method has  been added to retrieve during format pasting the data format corresponding to the given key and mapping when more than one result correspond to the key. If no result matches the mapping, then the first result found by using the key is returned.
+			</li>
+		</ul>
+		<ul>
+			<li><span class="label label-success">Added</span> 
+				<code>org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping.addFormatData(FormatDataKey, RepresentationElementMapping, AbstractFormatData)</code> method has been added to allow data format manager to register data format with mapping information when copying format.
+			</li>
+		</ul>
+		<ul>
+			<li><span class="label label-success">Deprecated</span></li>
+		</ul>
+		<p>
+			<code>org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManager.getFormatData(FormatDataKey)</code> It is replaced by 
+			<code>org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping.getFormatData(FormatDataKey, RepresentationElementMapping)</code> to better handle copy/paste format cases.
+		</p>
+		<ul>
+			<li><span class="label label-success">Deprecated</span></li>
+		</ul>
+		<p>
+			<code>org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManager.addFormatData(FormatDataKey, AbstractFormatData)</code> It is replaced by 
+			<code>org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping.addFormatData(FormatDataKey, RepresentationElementMapping, AbstractFormatData)</code> to better handle copy/paste format cases.
+		</p>
 		<h2 id="sirius4.1.1">Changes in Sirius 4.1.1</h2>
 		<h3 id="UserVisibleChanges">User-Visible Changes</h3>
 		<ul>
 			<li><span class="label label-info">Modified</span>The &#8220;straighten to&#8221; actions were previously disabled when an edge is connected to border nodes that have several edges. It is now allowed.</li>
 		</ul>
-		<h3 id="DeveloperVisibleChanges">Developer-Visible Changes</h3>
+		<h3 id="DeveloperVisibleChanges2">Developer-Visible Changes</h3>
 		<ul>
 			<li><span class="label label-success">Added</span> 
 				<code>org.eclipse.sirius.table.business.api.helper.TableHelper.getEStructuralFeature(DLine, DColumn)</code> method has been added to retrieve the EStructuralFeature associated to a table column.
@@ -213,7 +252,7 @@
 				<code>org.eclipse.sirius.diagram.ui.formatDataManager</code>. The deprecated extension point will be removed in the next 5.0 Sirius major release. Several classes associated with this deprecated extension point are also deprecated (see Developer-Visible Changes for details).
 			</li>
 		</ul>
-		<h3 id="DeveloperVisibleChanges2">Developer-Visible Changes</h3>
+		<h3 id="DeveloperVisibleChanges3">Developer-Visible Changes</h3>
 		<ul>
 			<li><span class="label label-success">Added</span> As the first step to save the DRepresentation in its own resource, 
 				<code>org.eclipse.sirius.viewpoint.DView.getOwnedRepresentationDescriptors()</code> has been added as a wrapper of the 
@@ -701,7 +740,7 @@
 			</li>
 			<li><span class="label label-info">Modified</span> The variable under VariableFilter, previously named &#8220;Variable&#8221;, is renamed to &#8220;Select Model Element Variable&#8221;. It is functionally equivalent.</li>
 		</ul>
-		<h3 id="DeveloperVisibleChanges3">Developer-Visible Changes</h3>
+		<h3 id="DeveloperVisibleChanges4">Developer-Visible Changes</h3>
 		<ul>
 			<li><span class="label label-success">Added</span> It is now possible to provide a full customized tab-bar by implementing the 
 				<code>ITabbarContributor</code> through the 
@@ -1183,7 +1222,7 @@
 				<code>IPermissionAuthority</code>) of the potential to delete objects. This is the reverse order of what was done before, and can have performance impacts if the precondition is slow. The specifier will to take care to ensure a good performance for the precondition expression of the delete tool.
 			</li>
 		</ul>
-		<h3 id="DeveloperVisibleChanges4">Developer-Visible Changes</h3>
+		<h3 id="DeveloperVisibleChanges5">Developer-Visible Changes</h3>
 		<h4 id="Partialsupportforinternationalization">Partial support for internationalization</h4>
 		<p>Sirius 3.1 introduces partial support for internationalization: all literal strings from the runtime part of Sirius are now externalized and can be localized by third parties by providing the appropriate &#8220;language packs&#8221; as OSGi fragments. Note that this does not concern the VSM editor&#8217;s UI, the VSMs themselves, or the parts of the UI inherited from Eclipse/EMF/GEF/GMF and other libraries and frameworks used by Sirius.</p>
 		<p>Some API changes were required to enable this. While technically breaking changes if interpreting strictly the OSGi versioning rules, the major version number of the impacted bundles was not incremented as the changes only concern classes that should not impact the vast majority of users. Most breaking changes concern the plug-in/activator classes from each bundle. They are:</p>
@@ -1740,7 +1779,7 @@
 				<em>EStructuralFeature</em> (inherited or with same name).
 			</li>
 		</ul>
-		<h3 id="DeveloperVisibleChanges5">Developer-Visible Changes</h3>
+		<h3 id="DeveloperVisibleChanges6">Developer-Visible Changes</h3>
 		<p>The most important and impacting changes in this release are (details below in plug-in specific sections):</p>
 		<ul>
 			<li><span class="label label-success">Added</span>  The new extension point 
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 559967c913..b736dfb7ac 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -4,6 +4,22 @@ h1. Release Notes for Sirius
 
 This document contains the release notes for recent major releases of Sirius. See also "the release notes from previous versions":Release_Notes_Previous.html for details about older releases.
 
+h2(#sirius4.1.2). Changes in Sirius 4.1.2
+
+h3. Developer-Visible Changes
+
+* <span class="label label-success">Added</span> @org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping@ class has  been added to handle copy/paste format with mapping information when an element target of a format pasting has many source diagram format corresponding to its key. In this case, we use the mapping information to get the more precise data format. And if no result matched, then we return the first found by using the key.
+
+* <span class="label label-success">Added</span> @org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping.getFormatData(FormatDataKey, RepresentationElementMapping)@ method has  been added to retrieve during format pasting the data format corresponding to the given key and mapping when more than one result correspond to the key. If no result matches the mapping, then the first result found by using the key is returned.
+
+* <span class="label label-success">Added</span> @org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping.addFormatData(FormatDataKey, RepresentationElementMapping, AbstractFormatData)@ method has been added to allow data format manager to register data format with mapping information when copying format.
+
+* <span class="label label-success">Deprecated</span>
+@org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManager.getFormatData(FormatDataKey)@ It is replaced by @org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping.getFormatData(FormatDataKey, RepresentationElementMapping)@ to better handle copy/paste format cases.
+
+* <span class="label label-success">Deprecated</span>
+@org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManager.addFormatData(FormatDataKey, AbstractFormatData)@ It is replaced by @org.eclipse.sirius.diagram.ui.tools.api.format.SiriusFormatDataManagerWithMapping.addFormatData(FormatDataKey, RepresentationElementMapping, AbstractFormatData)@ to better handle copy/paste format cases.
+
 h2(#sirius4.1.1). Changes in Sirius 4.1.1
 
 h3. User-Visible Changes
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.aird
index ca458d3a7f..fee0746075 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.aird
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.aird
@@ -1,3451 +1,3742 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<viewpoint:DAnalysis 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:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram/description http://www.eclipse.org/sirius/diagram/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/1.1.0#//diagram/description/style" xmi:id="_g3D3YM4UEd6bS_KBCUv05A" selectedViews="_hQXvQM4UEd6bS_KBCUv05A" version="8.0.0">
-  <models xmi:type="ecore:EPackage" href="My.ecore#/"/>
-  <ownedViews xmi:type="viewpoint:DRepresentationContainer" xmi:id="_hQXvQM4UEd6bS_KBCUv05A" initialized="true">
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_5zhU8M4UEd6bS_KBCUv05A" name="DiagType1 of MyPackage">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67mUgBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_5zijEM4UEd6bS_KBCUv05A" type="Sirius" element="_5zhU8M4UEd6bS_KBCUv05A" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_5zuJQM4UEd6bS_KBCUv05A" visible="false" type="2002" element="_nKPR0EggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_5z5IYM4UEd6bS_KBCUv05A" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_5z5vcM4UEd6bS_KBCUv05A" type="7001">
-              <children xmi:type="notation:Node" xmi:id="_PT8wgM4VEd6bS_KBCUv05A" visible="false" type="3007" element="_nKQf-EggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_PT-lsM4VEd6bS_KBCUv05A" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_PT-lsc4VEd6bS_KBCUv05A" x="95" y="13"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_PUj0gM4VEd6bS_KBCUv05A" type="3004" element="_nKRHAEggEeClJJrVvqnbbg">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_PUj0gc4VEd6bS_KBCUv05A" fontName="Sans"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PUj0gs4VEd6bS_KBCUv05A"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_PT8wgc4VEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GqmZEOPiEd6yD77yB6m-yA" x="485" y="96" width="96" height="40"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PT_MwM4VEd6bS_KBCUv05A" visible="false" type="3007" element="_nKRHB0ggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_PT_z0M4VEd6bS_KBCUv05A" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_PT_z0c4VEd6bS_KBCUv05A" x="75"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_PV4DIM4VEd6bS_KBCUv05A" type="3004" element="_nKRHCEggEeClJJrVvqnbbg">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_PV4DIc4VEd6bS_KBCUv05A" fontName="Sans"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PV4DIs4VEd6bS_KBCUv05A"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_PT_Mwc4VEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GqoOQePiEd6yD77yB6m-yA" x="493" y="6" width="78" height="35"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_PUAa4M4VEd6bS_KBCUv05A" visible="false" type="3007" element="_nKRuEEggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_PUBB8M4VEd6bS_KBCUv05A" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_PUBB8c4VEd6bS_KBCUv05A" x="56" y="62"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_PWcq4M4VEd6bS_KBCUv05A" type="3004" element="_nKRuEUggEeClJJrVvqnbbg">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_PWcq4c4VEd6bS_KBCUv05A" fontName="Sans"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PWcq4s4VEd6bS_KBCUv05A"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_PUAa4c4VEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GqoOQuPiEd6yD77yB6m-yA" y="12" width="109" height="63"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_5z5vcc4UEd6bS_KBCUv05A"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_5z5vcs4UEd6bS_KBCUv05A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_5zuJQc4UEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZNm-EOPeEd6yD77yB6m-yA" x="30" y="30" width="655" height="173"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_5z6WgM4UEd6bS_KBCUv05A" type="2002" element="_nKPR2UggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_5z69kM4UEd6bS_KBCUv05A" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_5z7koM4UEd6bS_KBCUv05A" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_5z7koc4UEd6bS_KBCUv05A"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_5z7kos4UEd6bS_KBCUv05A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_5z6Wgc4UEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZNqocOPeEd6yD77yB6m-yA" x="30" y="260" width="401" height="114"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_5z8LsM4UEd6bS_KBCUv05A" type="2002" element="_nKP46EggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_5z9Z0M4UEd6bS_KBCUv05A" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_5z9Z0c4UEd6bS_KBCUv05A" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_5z9Z0s4UEd6bS_KBCUv05A"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_5z9Z084UEd6bS_KBCUv05A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_5z8Lsc4UEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZNqocePeEd6yD77yB6m-yA" x="30" y="400" width="150" height="70"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_5z-A4M4UEd6bS_KBCUv05A" type="2002" element="_nKP48UggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_5z_PAM4UEd6bS_KBCUv05A" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_5z_PAc4UEd6bS_KBCUv05A" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_5z_PAs4UEd6bS_KBCUv05A"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_5z_PA84UEd6bS_KBCUv05A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_5z-A4c4UEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZNrPgOPeEd6yD77yB6m-yA" x="1644" y="30" width="150" height="70"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_5zijEc4UEd6bS_KBCUv05A"/>
-          <edges xmi:type="notation:Edge" xmi:id="_M9iiUOPYEd6LGpetMaKlYQ" type="4001" element="_nKS8MEggEeClJJrVvqnbbg" source="_PT8wgM4VEd6bS_KBCUv05A" target="_PT_MwM4VEd6bS_KBCUv05A">
-            <children xmi:type="notation:Node" xmi:id="_NB0lYOPYEd6LGpetMaKlYQ" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xEFvMPxBEd6MWOf7z4LcAg" x="-53" y="51" width="36" height="23"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oAlGgJkKEeCez7uszjfVoA" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGgZkKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oAlGgpkKEeCez7uszjfVoA" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGg5kKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_M9jJYOPYEd6LGpetMaKlYQ"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_M9jJYePYEd6LGpetMaKlYQ" fontName="Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GqnAIuPiEd6yD77yB6m-yA" points="[19, 24, 8, 96]$[119, 150, 108, 222]$[216, -28, 205, 44]$[16, -71, 5, 1]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GqnAIOPiEd6yD77yB6m-yA" id="(0.41666666,0.057142857)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GqnAIePiEd6yD77yB6m-yA" id="(0.57894737,0.94285715)"/>
-          </edges>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKPR0EggEeClJJrVvqnbbg" name="Container p1" visible="false">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_nMy2kEggEeClJJrVvqnbbg"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKPR0UggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKPR1kggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKPR10ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKPR2EggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKPR1UggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKQf-EggEeClJJrVvqnbbg" name="C1-1" visible="false" outgoingEdges="_nKS8MEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKRHAEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKRHBEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKRHBUggEeClJJrVvqnbbg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UnMwcDV2EeKMTft4yhZhAw"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKRHB0ggEeClJJrVvqnbbg" name="C1-2" visible="false" incomingEdges="_nKS8MEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKRHCEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKRHDEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKRHDUggEeClJJrVvqnbbg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UnNXgDV2EeKMTft4yhZhAw"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKRuEEggEeClJJrVvqnbbg" name="C1-3" visible="false" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKRuEUggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKRuFUggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKRuFkggEeClJJrVvqnbbg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_UnNXgTV2EeKMTft4yhZhAw"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
-        </ownedDiagramElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKPR2UggEeClJJrVvqnbbg" name="Container p2">
+<xmi:XMI 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:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis xmi:id="_g3D3YM4UEd6bS_KBCUv05A" selectedViews="_hQXvQM4UEd6bS_KBCUv05A" version="11.1.0.201608251200">
+    <semanticResources>My.ecore</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_hQXvQM4UEd6bS_KBCUv05A">
+      <viewpoint xmi:type="description:Viewpoint" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']"/>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiELDFEeanMtzDRncztA" name="DiagType1 of MyPackage" representation="_5zhU8M4UEd6bS_KBCUv05A">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiEbDFEeanMtzDRncztA" name="DiagType2 of MyPackage" representation="_R0qkUM4WEd6bS_KBCUv05A">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiErDFEeanMtzDRncztA" name="DiagType3 of MyPackage" representation="_yQmosM9qEd6bdqQ-rTRGJg">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiE7DFEeanMtzDRncztA" name="DiagType5 of MyPackage" representation="_8IynYN8kEd6puriA092P2A">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiFLDFEeanMtzDRncztA" name="DiagType4 of MyPackage" representation="_QFauEN9KEd62yq234upbUg">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiFbDFEeanMtzDRncztA" name="DiagType6 of MyPackage" representation="_RLK_wd9LEd62yq234upbUg">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiFrDFEeanMtzDRncztA" name="DiagType7 of MyPackage" representation="_XI_pEd9LEd62yq234upbUg">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiF7DFEeanMtzDRncztA" name="DiagType8 of MyPackage" representation="_UJ_2cN9NEd69CIe_kfq8uw">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiGLDFEeanMtzDRncztA" name="DiagType9 of MyPackage" representation="_BXkP4OWoEd6JMo4lxOczEg">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiGbDFEeanMtzDRncztA" name="DiagType8 of p2" representation="_E26kAOi7Ed6VHqj_dPYIrw">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']"/>
         <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKP44EggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKP45UggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKP45kggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKP450ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKP45EggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKP46EggEeClJJrVvqnbbg" name="Container p3">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKP46UggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKP47kggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKP470ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKP48EggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKP47UggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiGrDFEeanMtzDRncztA" name="Type1 Raw Diagram" representation="_JnbuIPlNEd6Y1bDJsdKxyg">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiG7DFEeanMtzDRncztA" name="Type7 Raw Diagram" representation="_AE9PEfoNEd6aXOd_1RF62g">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiHLDFEeanMtzDRncztA" name="Type8 Raw Diagram" representation="_J56iAPoNEd6aXOd_1RF62g">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_RSeiHbDFEeanMtzDRncztA" name="Type9 Raw Diagram" representation="_Zf70oPoNEd6aXOd_1RF62g">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_ILG-0LDOEeaJB9-B3hmsRw" name="DiagType10 of MyPackage" representation="_ILG-0bDOEeaJB9-B3hmsRw">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_72WzMLDOEeaJB9-B3hmsRw" name="Type10 Raw Diagram" representation="_73Nu0LDOEeaJB9-B3hmsRw">
+        <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']"/>
+        <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_am5TwLDFEeanMtzDRncztA">
+      <viewpoint xmi:type="description:Viewpoint" href="3.6/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']"/>
+    </ownedViews>
+    <ownedViews xmi:type="viewpoint:DView" xmi:id="_c7z8sLDFEeanMtzDRncztA">
+      <viewpoint xmi:type="description:Viewpoint" href="3.5/My.odesign#//@ownedViewpoints[name='TestLayoutCopy']"/>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram xmi:id="_5zhU8M4UEd6bS_KBCUv05A" name="DiagType1 of MyPackage">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67mUgBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_5zijEM4UEd6bS_KBCUv05A" type="Sirius" element="_5zhU8M4UEd6bS_KBCUv05A" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_5zuJQM4UEd6bS_KBCUv05A" visible="false" type="2002" element="_nKPR0EggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_5z5IYM4UEd6bS_KBCUv05A" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_5z5vcM4UEd6bS_KBCUv05A" type="7001">
+            <children xmi:type="notation:Node" xmi:id="_PT8wgM4VEd6bS_KBCUv05A" visible="false" type="3007" element="_nKQf-EggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_PT-lsM4VEd6bS_KBCUv05A" type="5003">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_PT-lsc4VEd6bS_KBCUv05A" x="95" y="13"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_PUj0gM4VEd6bS_KBCUv05A" type="3004" element="_nKRHAEggEeClJJrVvqnbbg">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_PUj0gc4VEd6bS_KBCUv05A" fontName="Sans"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PUj0gs4VEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_PT8wgc4VEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GqmZEOPiEd6yD77yB6m-yA" x="485" y="96" width="96" height="40"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_PT_MwM4VEd6bS_KBCUv05A" visible="false" type="3007" element="_nKRHB0ggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_PT_z0M4VEd6bS_KBCUv05A" type="5003">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_PT_z0c4VEd6bS_KBCUv05A" x="75"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_PV4DIM4VEd6bS_KBCUv05A" type="3004" element="_nKRHCEggEeClJJrVvqnbbg">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_PV4DIc4VEd6bS_KBCUv05A" fontName="Sans"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PV4DIs4VEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_PT_Mwc4VEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GqoOQePiEd6yD77yB6m-yA" x="493" y="6" width="78" height="35"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_PUAa4M4VEd6bS_KBCUv05A" visible="false" type="3007" element="_nKRuEEggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_PUBB8M4VEd6bS_KBCUv05A" type="5003">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_PUBB8c4VEd6bS_KBCUv05A" x="56" y="62"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_PWcq4M4VEd6bS_KBCUv05A" type="3004" element="_nKRuEUggEeClJJrVvqnbbg">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_PWcq4c4VEd6bS_KBCUv05A" fontName="Sans"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PWcq4s4VEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_PUAa4c4VEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GqoOQuPiEd6yD77yB6m-yA" y="12" width="109" height="63"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_5z5vcc4UEd6bS_KBCUv05A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_5z5vcs4UEd6bS_KBCUv05A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_5zuJQc4UEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZNm-EOPeEd6yD77yB6m-yA" x="30" y="30" width="655" height="173"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_5z6WgM4UEd6bS_KBCUv05A" type="2002" element="_nKPR2UggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_5z69kM4UEd6bS_KBCUv05A" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_5z7koM4UEd6bS_KBCUv05A" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_5z7koc4UEd6bS_KBCUv05A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_5z7kos4UEd6bS_KBCUv05A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_5z6Wgc4UEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZNqocOPeEd6yD77yB6m-yA" x="30" y="260" width="401" height="114"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_5z8LsM4UEd6bS_KBCUv05A" type="2002" element="_nKP46EggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_5z9Z0M4UEd6bS_KBCUv05A" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_5z9Z0c4UEd6bS_KBCUv05A" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_5z9Z0s4UEd6bS_KBCUv05A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_5z9Z084UEd6bS_KBCUv05A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_5z8Lsc4UEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZNqocePeEd6yD77yB6m-yA" x="30" y="400" width="150" height="70"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_5z-A4M4UEd6bS_KBCUv05A" type="2002" element="_nKP48UggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_5z_PAM4UEd6bS_KBCUv05A" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_5z_PAc4UEd6bS_KBCUv05A" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_5z_PAs4UEd6bS_KBCUv05A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_5z_PA84UEd6bS_KBCUv05A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_5z-A4c4UEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZNrPgOPeEd6yD77yB6m-yA" x="1644" y="30" width="150" height="70"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_5zijEc4UEd6bS_KBCUv05A"/>
+        <edges xmi:type="notation:Edge" xmi:id="_M9iiUOPYEd6LGpetMaKlYQ" type="4001" element="_nKS8MEggEeClJJrVvqnbbg" source="_PT8wgM4VEd6bS_KBCUv05A" target="_PT_MwM4VEd6bS_KBCUv05A">
+          <children xmi:type="notation:Node" xmi:id="_NB0lYOPYEd6LGpetMaKlYQ" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xEFvMPxBEd6MWOf7z4LcAg" x="-53" y="51" width="36" height="23"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oAlGgJkKEeCez7uszjfVoA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGgZkKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oAlGgpkKEeCez7uszjfVoA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGg5kKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_M9jJYOPYEd6LGpetMaKlYQ"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_M9jJYePYEd6LGpetMaKlYQ" fontName="Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GqnAIuPiEd6yD77yB6m-yA" points="[19, 24, 8, 96]$[119, 150, 108, 222]$[216, -28, 205, 44]$[16, -71, 5, 1]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GqnAIOPiEd6yD77yB6m-yA" id="(0.41666666,0.057142857)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GqnAIePiEd6yD77yB6m-yA" id="(0.57894737,0.94285715)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSgXQLDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSgXQbDFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKPR0EggEeClJJrVvqnbbg" name="Container p1" visible="false">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_nMy2kEggEeClJJrVvqnbbg"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKPR0UggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKQf-EggEeClJJrVvqnbbg" name="C1-1" visible="false" outgoingEdges="_nKS8MEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKRHAEggEeClJJrVvqnbbg">
+          <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKP48UggEeClJJrVvqnbbg" name="Container p4">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKQf8EggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKQf9UggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKQf9kggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKQf90ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKQf9EggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKRHB0ggEeClJJrVvqnbbg" name="C1-2" visible="false" incomingEdges="_nKS8MEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKRHCEggEeClJJrVvqnbbg">
+          <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nKS8MEggEeClJJrVvqnbbg" name="aC1-2" visible="false" sourceNode="_nKQf-EggEeClJJrVvqnbbg" targetNode="_nKRHB0ggEeClJJrVvqnbbg">
-        <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
-        <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mw7CouPYEd6LGpetMaKlYQ">
-          <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@edgeMappings[name='DT1_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_Mw7Co-PYEd6LGpetMaKlYQ" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOeEggEeClJJrVvqnbbg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Unkj4DV2EeKMTft4yhZhAw"/>
-          </centerLabelStyle>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKRuEEggEeClJJrVvqnbbg" name="C1-3" visible="false" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKRuEUggEeClJJrVvqnbbg">
+          <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@edgeMappings[name='DT1_EReference']"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
       </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_5zhU8c4UEd6bS_KBCUv05A"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_R0qkUM4WEd6bS_KBCUv05A" name="DiagType2 of MyPackage">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67m7kBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_R0rycM4WEd6bS_KBCUv05A" type="Sirius" element="_R0qkUM4WEd6bS_KBCUv05A" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_R1kjQM4WEd6bS_KBCUv05A" type="2002" element="_nKWmkEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_R1kjQ84WEd6bS_KBCUv05A" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_R1kjRM4WEd6bS_KBCUv05A" type="7001">
-              <children xmi:type="notation:Node" xmi:id="_R1wwgM4WEd6bS_KBCUv05A" type="3009" element="_nKYbwEggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_R1xXkM4WEd6bS_KBCUv05A" type="5004"/>
-                <children xmi:type="notation:Node" xmi:id="_R1x-oM4WEd6bS_KBCUv05A" type="7003">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_R1x-oc4WEd6bS_KBCUv05A"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_R1x-os4WEd6bS_KBCUv05A"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_R1wwgc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MwA4IePiEd6yD77yB6m-yA" x="485" y="101" width="96" height="42"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_R1x-o84WEd6bS_KBCUv05A" type="3009" element="_nKZC2EggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_R1ylss4WEd6bS_KBCUv05A" type="5004"/>
-                <children xmi:type="notation:Node" xmi:id="_R1yls84WEd6bS_KBCUv05A" type="7003">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_R1yltM4WEd6bS_KBCUv05A"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_R1yltc4WEd6bS_KBCUv05A"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_R1ylsM4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MwCtUePiEd6yD77yB6m-yA" x="495" y="6" width="89" height="38"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_R1ylts4WEd6bS_KBCUv05A" type="3009" element="_nKZp6EggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_R1zMwM4WEd6bS_KBCUv05A" type="5004"/>
-                <children xmi:type="notation:Node" xmi:id="_R1zMwc4WEd6bS_KBCUv05A" type="7003">
-                  <children xmi:type="notation:Node" xmi:id="_oLLRUPoeEd6RHaLmmwTZjQ" type="3010" element="_nKa4AEggEeClJJrVvqnbbg">
-                    <layoutConstraint xmi:type="notation:Location" xmi:id="_oLLRUfoeEd6RHaLmmwTZjQ"/>
-                  </children>
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_R1zMws4WEd6bS_KBCUv05A"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_R1zMw84WEd6bS_KBCUv05A"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKPR2UggEeClJJrVvqnbbg" name="Container p2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKP44EggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKP46EggEeClJJrVvqnbbg" name="Container p3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKP46UggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKP48UggEeClJJrVvqnbbg" name="Container p4">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKQf8EggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nKS8MEggEeClJJrVvqnbbg" name="aC1-2" visible="false" sourceNode="_nKQf-EggEeClJJrVvqnbbg" targetNode="_nKRHB0ggEeClJJrVvqnbbg">
+      <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Mw7CouPYEd6LGpetMaKlYQ">
+        <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@edgeMappings[name='DT1_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOeEggEeClJJrVvqnbbg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@edgeMappings[name='DT1_EReference']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_5zhU8c4UEd6bS_KBCUv05A"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_R0qkUM4WEd6bS_KBCUv05A" name="DiagType2 of MyPackage">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67m7kBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_R0rycM4WEd6bS_KBCUv05A" type="Sirius" element="_R0qkUM4WEd6bS_KBCUv05A" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_R1kjQM4WEd6bS_KBCUv05A" type="2002" element="_nKWmkEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_R1kjQ84WEd6bS_KBCUv05A" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_R1kjRM4WEd6bS_KBCUv05A" type="7001">
+            <children xmi:type="notation:Node" xmi:id="_R1wwgM4WEd6bS_KBCUv05A" type="3009" element="_nKYbwEggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_R1xXkM4WEd6bS_KBCUv05A" type="5004"/>
+              <children xmi:type="notation:Node" xmi:id="_R1x-oM4WEd6bS_KBCUv05A" type="7003">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_R1x-oc4WEd6bS_KBCUv05A"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_R1x-os4WEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_R1wwgc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MwA4IePiEd6yD77yB6m-yA" x="485" y="101" width="96" height="42"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_R1x-o84WEd6bS_KBCUv05A" type="3009" element="_nKZC2EggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_R1ylss4WEd6bS_KBCUv05A" type="5004"/>
+              <children xmi:type="notation:Node" xmi:id="_R1yls84WEd6bS_KBCUv05A" type="7003">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_R1yltM4WEd6bS_KBCUv05A"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_R1yltc4WEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_R1ylsM4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MwCtUePiEd6yD77yB6m-yA" x="495" y="6" width="89" height="38"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_R1ylts4WEd6bS_KBCUv05A" type="3009" element="_nKZp6EggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_R1zMwM4WEd6bS_KBCUv05A" type="5004"/>
+              <children xmi:type="notation:Node" xmi:id="_R1zMwc4WEd6bS_KBCUv05A" type="7003">
+                <children xmi:type="notation:Node" xmi:id="_oLLRUPoeEd6RHaLmmwTZjQ" type="3010" element="_nKa4AEggEeClJJrVvqnbbg">
+                  <styles xmi:type="notation:FontStyle" xmi:id="_RSo6ILDFEeanMtzDRncztA"/>
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_oLLRUfoeEd6RHaLmmwTZjQ"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_R1ylt84WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MwDUYOPiEd6yD77yB6m-yA" y="12" width="111" height="63"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_R1zz0M4WEd6bS_KBCUv05A" type="3008" element="_nKbfE0ggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_R10a4M4WEd6bS_KBCUv05A" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_R11B8M4WEd6bS_KBCUv05A" type="7002">
-                  <children xmi:type="notation:Node" xmi:id="_R123IM4WEd6bS_KBCUv05A" type="3009" element="_nKctM0ggEeClJJrVvqnbbg">
-                    <children xmi:type="notation:Node" xmi:id="_R13eMM4WEd6bS_KBCUv05A" type="5004"/>
-                    <children xmi:type="notation:Node" xmi:id="_R13eMc4WEd6bS_KBCUv05A" type="7003">
-                      <children xmi:type="notation:Node" xmi:id="_uyF68PoeEd6RHaLmmwTZjQ" type="3010" element="_nKd7UEggEeClJJrVvqnbbg">
-                        <layoutConstraint xmi:type="notation:Location" xmi:id="_uyF68foeEd6RHaLmmwTZjQ"/>
-                      </children>
-                      <styles xmi:type="notation:SortingStyle" xmi:id="_R13eMs4WEd6bS_KBCUv05A"/>
-                      <styles xmi:type="notation:FilteringStyle" xmi:id="_R13eM84WEd6bS_KBCUv05A"/>
-                    </children>
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_R123Ic4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pTKOEOQaEd63Yphxkt5uAA" x="60" y="60" width="74" height="47"/>
-                  </children>
-                  <children xmi:type="notation:Node" xmi:id="_R13eNM4WEd6bS_KBCUv05A" type="3009" element="_nKdUQ0ggEeClJJrVvqnbbg">
-                    <children xmi:type="notation:Node" xmi:id="_R14FQM4WEd6bS_KBCUv05A" type="5004"/>
-                    <children xmi:type="notation:Node" xmi:id="_R14FQc4WEd6bS_KBCUv05A" type="7003">
-                      <styles xmi:type="notation:SortingStyle" xmi:id="_R14FQs4WEd6bS_KBCUv05A"/>
-                      <styles xmi:type="notation:FilteringStyle" xmi:id="_R14FQ84WEd6bS_KBCUv05A"/>
+                <styles xmi:type="notation:SortingStyle" xmi:id="_R1zMws4WEd6bS_KBCUv05A"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_R1zMw84WEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_R1ylt84WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MwDUYOPiEd6yD77yB6m-yA" y="12" width="111" height="63"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_R1zz0M4WEd6bS_KBCUv05A" type="3008" element="_nKbfE0ggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_R10a4M4WEd6bS_KBCUv05A" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_R11B8M4WEd6bS_KBCUv05A" type="7002">
+                <children xmi:type="notation:Node" xmi:id="_R123IM4WEd6bS_KBCUv05A" type="3009" element="_nKctM0ggEeClJJrVvqnbbg">
+                  <children xmi:type="notation:Node" xmi:id="_R13eMM4WEd6bS_KBCUv05A" type="5004"/>
+                  <children xmi:type="notation:Node" xmi:id="_R13eMc4WEd6bS_KBCUv05A" type="7003">
+                    <children xmi:type="notation:Node" xmi:id="_uyF68PoeEd6RHaLmmwTZjQ" type="3010" element="_nKd7UEggEeClJJrVvqnbbg">
+                      <styles xmi:type="notation:FontStyle" xmi:id="_RSo6IbDFEeanMtzDRncztA"/>
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_uyF68foeEd6RHaLmmwTZjQ"/>
                     </children>
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_R13eNc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRQE8OPiEd6yD77yB6m-yA" x="203" y="324" width="58" height="40"/>
+                    <styles xmi:type="notation:SortingStyle" xmi:id="_R13eMs4WEd6bS_KBCUv05A"/>
+                    <styles xmi:type="notation:FilteringStyle" xmi:id="_R13eM84WEd6bS_KBCUv05A"/>
                   </children>
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_R11B8c4WEd6bS_KBCUv05A"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_R11B8s4WEd6bS_KBCUv05A"/>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_R123Ic4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pTKOEOQaEd63Yphxkt5uAA" x="60" y="60" width="74" height="47"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_R1zz0c4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R1zz0s4WEd6bS_KBCUv05A" x="192" y="30"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_R11B884WEd6bS_KBCUv05A" type="3008" element="_nKcGIEggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_R11pAM4WEd6bS_KBCUv05A" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_R11pAc4WEd6bS_KBCUv05A" type="7002">
-                  <children xmi:type="notation:Node" xmi:id="_R14sUM4WEd6bS_KBCUv05A" type="3009" element="_nKeiYkggEeClJJrVvqnbbg">
-                    <children xmi:type="notation:Node" xmi:id="_R14sU84WEd6bS_KBCUv05A" type="5004"/>
-                    <children xmi:type="notation:Node" xmi:id="_R14sVM4WEd6bS_KBCUv05A" type="7003">
-                      <styles xmi:type="notation:SortingStyle" xmi:id="_R14sVc4WEd6bS_KBCUv05A"/>
-                      <styles xmi:type="notation:FilteringStyle" xmi:id="_R14sVs4WEd6bS_KBCUv05A"/>
-                    </children>
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_R14sUc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRQE8ePiEd6yD77yB6m-yA" x="190" y="72" width="58" height="40"/>
+                <children xmi:type="notation:Node" xmi:id="_R13eNM4WEd6bS_KBCUv05A" type="3009" element="_nKdUQ0ggEeClJJrVvqnbbg">
+                  <children xmi:type="notation:Node" xmi:id="_R14FQM4WEd6bS_KBCUv05A" type="5004"/>
+                  <children xmi:type="notation:Node" xmi:id="_R14FQc4WEd6bS_KBCUv05A" type="7003">
+                    <styles xmi:type="notation:SortingStyle" xmi:id="_R14FQs4WEd6bS_KBCUv05A"/>
+                    <styles xmi:type="notation:FilteringStyle" xmi:id="_R14FQ84WEd6bS_KBCUv05A"/>
                   </children>
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_R11pAs4WEd6bS_KBCUv05A"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_R11pA84WEd6bS_KBCUv05A"/>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_R13eNc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRQE8OPiEd6yD77yB6m-yA" x="203" y="324" width="58" height="40"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_R11B9M4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R11B9c4WEd6bS_KBCUv05A" x="85" y="162"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_R11pBM4WEd6bS_KBCUv05A" type="3008" element="_nKcGKUggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_R12QEM4WEd6bS_KBCUv05A" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_R12QEc4WEd6bS_KBCUv05A" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_R12QEs4WEd6bS_KBCUv05A"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_R12QE84WEd6bS_KBCUv05A"/>
+                <styles xmi:type="notation:SortingStyle" xmi:id="_R11B8c4WEd6bS_KBCUv05A"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_R11B8s4WEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_R1zz0c4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R1zz0s4WEd6bS_KBCUv05A" x="192" y="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_R11B884WEd6bS_KBCUv05A" type="3008" element="_nKcGIEggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_R11pAM4WEd6bS_KBCUv05A" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_R11pAc4WEd6bS_KBCUv05A" type="7002">
+                <children xmi:type="notation:Node" xmi:id="_R14sUM4WEd6bS_KBCUv05A" type="3009" element="_nKeiYkggEeClJJrVvqnbbg">
+                  <children xmi:type="notation:Node" xmi:id="_R14sU84WEd6bS_KBCUv05A" type="5004"/>
+                  <children xmi:type="notation:Node" xmi:id="_R14sVM4WEd6bS_KBCUv05A" type="7003">
+                    <styles xmi:type="notation:SortingStyle" xmi:id="_R14sVc4WEd6bS_KBCUv05A"/>
+                    <styles xmi:type="notation:FilteringStyle" xmi:id="_R14sVs4WEd6bS_KBCUv05A"/>
+                  </children>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_R14sUc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRQE8ePiEd6yD77yB6m-yA" x="190" y="72" width="58" height="40"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_R11pBc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R11pBs4WEd6bS_KBCUv05A" x="305" y="164"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_R1kjRc4WEd6bS_KBCUv05A"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_R1kjRs4WEd6bS_KBCUv05A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_R1kjQc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MwA4IOPiEd6yD77yB6m-yA" x="30" y="30" width="653" height="173"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_R1lKUM4WEd6bS_KBCUv05A" type="2002" element="_nKXNokggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_R1lKU84WEd6bS_KBCUv05A" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_R1lKVM4WEd6bS_KBCUv05A" type="7001">
-              <children xmi:type="notation:Node" xmi:id="_R15TYM4WEd6bS_KBCUv05A" type="3008" element="_nKfwgEggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_R156cM4WEd6bS_KBCUv05A" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_R156cc4WEd6bS_KBCUv05A" type="7002">
-                  <children xmi:type="notation:Node" xmi:id="_mb_XsO8SEd6XKL8iki2fzg" type="3009" element="_nKg-o0ggEeClJJrVvqnbbg">
-                    <children xmi:type="notation:Node" xmi:id="_mcBz8O8SEd6XKL8iki2fzg" type="5004"/>
-                    <children xmi:type="notation:Node" xmi:id="_mcBz8e8SEd6XKL8iki2fzg" type="7003">
-                      <children xmi:type="notation:Node" xmi:id="_uyHwIPoeEd6RHaLmmwTZjQ" type="3010" element="_nKiMwEggEeClJJrVvqnbbg">
-                        <layoutConstraint xmi:type="notation:Location" xmi:id="_uyHwIfoeEd6RHaLmmwTZjQ"/>
-                      </children>
-                      <styles xmi:type="notation:SortingStyle" xmi:id="_mcBz8u8SEd6XKL8iki2fzg"/>
-                      <styles xmi:type="notation:FilteringStyle" xmi:id="_mcBz8-8SEd6XKL8iki2fzg"/>
+                <styles xmi:type="notation:SortingStyle" xmi:id="_R11pAs4WEd6bS_KBCUv05A"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_R11pA84WEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_R11B9M4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R11B9c4WEd6bS_KBCUv05A" x="85" y="162"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_R11pBM4WEd6bS_KBCUv05A" type="3008" element="_nKcGKUggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_R12QEM4WEd6bS_KBCUv05A" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_R12QEc4WEd6bS_KBCUv05A" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_R12QEs4WEd6bS_KBCUv05A"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_R12QE84WEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_R11pBc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R11pBs4WEd6bS_KBCUv05A" x="305" y="164"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_R1kjRc4WEd6bS_KBCUv05A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_R1kjRs4WEd6bS_KBCUv05A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_R1kjQc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MwA4IOPiEd6yD77yB6m-yA" x="30" y="30" width="653" height="173"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_R1lKUM4WEd6bS_KBCUv05A" type="2002" element="_nKXNokggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_R1lKU84WEd6bS_KBCUv05A" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_R1lKVM4WEd6bS_KBCUv05A" type="7001">
+            <children xmi:type="notation:Node" xmi:id="_R15TYM4WEd6bS_KBCUv05A" type="3008" element="_nKfwgEggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_R156cM4WEd6bS_KBCUv05A" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_R156cc4WEd6bS_KBCUv05A" type="7002">
+                <children xmi:type="notation:Node" xmi:id="_mb_XsO8SEd6XKL8iki2fzg" type="3009" element="_nKg-o0ggEeClJJrVvqnbbg">
+                  <children xmi:type="notation:Node" xmi:id="_mcBz8O8SEd6XKL8iki2fzg" type="5004"/>
+                  <children xmi:type="notation:Node" xmi:id="_mcBz8e8SEd6XKL8iki2fzg" type="7003">
+                    <children xmi:type="notation:Node" xmi:id="_uyHwIPoeEd6RHaLmmwTZjQ" type="3010" element="_nKiMwEggEeClJJrVvqnbbg">
+                      <styles xmi:type="notation:FontStyle" xmi:id="_RSo6IrDFEeanMtzDRncztA"/>
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_uyHwIfoeEd6RHaLmmwTZjQ"/>
                     </children>
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_mb_Xse8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mb_Xsu8SEd6XKL8iki2fzg" width="153" height="53"/>
+                    <styles xmi:type="notation:SortingStyle" xmi:id="_mcBz8u8SEd6XKL8iki2fzg"/>
+                    <styles xmi:type="notation:FilteringStyle" xmi:id="_mcBz8-8SEd6XKL8iki2fzg"/>
                   </children>
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_R156cs4WEd6bS_KBCUv05A"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_R156c84WEd6bS_KBCUv05A"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_R15TYc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R15TYs4WEd6bS_KBCUv05A" x="30" y="30" width="169"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_R156dM4WEd6bS_KBCUv05A" type="3008" element="_nKgXmEggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_R16hgM4WEd6bS_KBCUv05A" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_R16hgc4WEd6bS_KBCUv05A" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_R16hgs4WEd6bS_KBCUv05A"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_R16hg84WEd6bS_KBCUv05A"/>
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_mb_Xse8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mb_Xsu8SEd6XKL8iki2fzg" width="153" height="53"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_R156dc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R156ds4WEd6bS_KBCUv05A" x="238" y="30"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_R1lKVc4WEd6bS_KBCUv05A"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_R1lKVs4WEd6bS_KBCUv05A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_R1lKUc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GlTmMOPeEd6yD77yB6m-yA" x="30" y="260" width="401" height="114"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_R1lxYM4WEd6bS_KBCUv05A" type="2002" element="_nKXNq0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_R1lxY84WEd6bS_KBCUv05A" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_R1lxZM4WEd6bS_KBCUv05A" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_R1lxZc4WEd6bS_KBCUv05A"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_R1lxZs4WEd6bS_KBCUv05A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_R1lxYc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GlTmMePeEd6yD77yB6m-yA" x="30" y="400" width="150" height="70"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_R1mYcM4WEd6bS_KBCUv05A" type="2002" element="_nKX0uEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_R1mYc84WEd6bS_KBCUv05A" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_R1mYdM4WEd6bS_KBCUv05A" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_R1mYdc4WEd6bS_KBCUv05A"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_R1mYds4WEd6bS_KBCUv05A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_R1mYcc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GlUNQOPeEd6yD77yB6m-yA" x="1644" y="30" width="150" height="70"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_R0rycc4WEd6bS_KBCUv05A"/>
-          <edges xmi:type="notation:Edge" xmi:id="_P5814M-cEd6r8-xS3EkADw" type="4001" element="_nKkB8EggEeClJJrVvqnbbg" source="_R1wwgM4WEd6bS_KBCUv05A" target="_R1x-o84WEd6bS_KBCUv05A">
-            <children xmi:type="notation:Node" xmi:id="_P59c88-cEd6r8-xS3EkADw" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zNmNMIRLEeOg_8QSiaL3XA" x="-50" y="48"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oAlGhJkKEeCez7uszjfVoA" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGhZkKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oAlGhpkKEeCez7uszjfVoA" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGh5kKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_P59c8M-cEd6r8-xS3EkADw"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_P59c8c-cEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MwBfMuPiEd6yD77yB6m-yA" points="[68, 33, -269, -37]$[168, 160, 1, 170]$[266, -19, 154, 21]$[65, -59, -17, -9]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MwBfMOPiEd6yD77yB6m-yA" id="(0.41666666,0.057142857)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MwBfMePiEd6yD77yB6m-yA" id="(0.57894737,0.94285715)"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_U7F0gM-cEd6r8-xS3EkADw" type="4001" element="_nKkpAEggEeClJJrVvqnbbg" source="_R1wwgM4WEd6bS_KBCUv05A" target="_R123IM4WEd6bS_KBCUv05A">
-            <children xmi:type="notation:Node" xmi:id="_U7GbkM-cEd6r8-xS3EkADw" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zNmNMYRLEeOg_8QSiaL3XA" x="6"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oAlGiJkKEeCez7uszjfVoA" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGiZkKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oAlGipkKEeCez7uszjfVoA" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGi5kKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_U7F0gc-cEd6r8-xS3EkADw"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_U7F0gs-cEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GROPwePiEd6yD77yB6m-yA" points="[5, 6, 220, 16]$[-124, 18, 101, 40]$[-229, -28, -2, -2]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GRNosePiEd6yD77yB6m-yA" id="(0.0,0.0)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GROPwOPiEd6yD77yB6m-yA" id="(0.0,0.0)"/>
-          </edges>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKWmkEggEeClJJrVvqnbbg" name="Container p1">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKWmkUggEeClJJrVvqnbbg" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKWmlkggEeClJJrVvqnbbg"/>
+                <styles xmi:type="notation:SortingStyle" xmi:id="_R156cs4WEd6bS_KBCUv05A"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_R156c84WEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_R15TYc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R15TYs4WEd6bS_KBCUv05A" x="30" y="30" width="169"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_R156dM4WEd6bS_KBCUv05A" type="3008" element="_nKgXmEggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_R16hgM4WEd6bS_KBCUv05A" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_R16hgc4WEd6bS_KBCUv05A" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_R16hgs4WEd6bS_KBCUv05A"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_R16hg84WEd6bS_KBCUv05A"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_R156dc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R156ds4WEd6bS_KBCUv05A" x="238" y="30"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_R1lKVc4WEd6bS_KBCUv05A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_R1lKVs4WEd6bS_KBCUv05A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_R1lKUc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GlTmMOPeEd6yD77yB6m-yA" x="30" y="260" width="401" height="114"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_R1lxYM4WEd6bS_KBCUv05A" type="2002" element="_nKXNq0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_R1lxY84WEd6bS_KBCUv05A" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_R1lxZM4WEd6bS_KBCUv05A" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_R1lxZc4WEd6bS_KBCUv05A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_R1lxZs4WEd6bS_KBCUv05A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_R1lxYc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GlTmMePeEd6yD77yB6m-yA" x="30" y="400" width="150" height="70"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_R1mYcM4WEd6bS_KBCUv05A" type="2002" element="_nKX0uEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_R1mYc84WEd6bS_KBCUv05A" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_R1mYdM4WEd6bS_KBCUv05A" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_R1mYdc4WEd6bS_KBCUv05A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_R1mYds4WEd6bS_KBCUv05A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_R1mYcc4WEd6bS_KBCUv05A" fontName="Sans" fontHeight="10"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GlUNQOPeEd6yD77yB6m-yA" x="1644" y="30" width="150" height="70"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_R0rycc4WEd6bS_KBCUv05A"/>
+        <edges xmi:type="notation:Edge" xmi:id="_P5814M-cEd6r8-xS3EkADw" type="4001" element="_nKkB8EggEeClJJrVvqnbbg" source="_R1wwgM4WEd6bS_KBCUv05A" target="_R1x-o84WEd6bS_KBCUv05A">
+          <children xmi:type="notation:Node" xmi:id="_P59c88-cEd6r8-xS3EkADw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zNmNMIRLEeOg_8QSiaL3XA" x="-50" y="48"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oAlGhJkKEeCez7uszjfVoA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGhZkKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oAlGhpkKEeCez7uszjfVoA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGh5kKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_P59c8M-cEd6r8-xS3EkADw"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_P59c8c-cEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MwBfMuPiEd6yD77yB6m-yA" points="[68, 33, -269, -37]$[168, 160, 1, 170]$[266, -19, 154, 21]$[65, -59, -17, -9]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MwBfMOPiEd6yD77yB6m-yA" id="(0.41666666,0.057142857)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MwBfMePiEd6yD77yB6m-yA" id="(0.57894737,0.94285715)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_U7F0gM-cEd6r8-xS3EkADw" type="4001" element="_nKkpAEggEeClJJrVvqnbbg" source="_R1wwgM4WEd6bS_KBCUv05A" target="_R123IM4WEd6bS_KBCUv05A">
+          <children xmi:type="notation:Node" xmi:id="_U7GbkM-cEd6r8-xS3EkADw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zNmNMYRLEeOg_8QSiaL3XA" x="6"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oAlGiJkKEeCez7uszjfVoA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGiZkKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oAlGipkKEeCez7uszjfVoA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAlGi5kKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_U7F0gc-cEd6r8-xS3EkADw"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_U7F0gs-cEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GROPwePiEd6yD77yB6m-yA" points="[5, 6, 220, 16]$[-124, 18, 101, 40]$[-229, -28, -2, -2]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GRNosePiEd6yD77yB6m-yA" id="(0.0,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GROPwOPiEd6yD77yB6m-yA" id="(0.0,0.0)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd4LDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd4bDFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKWmkEggEeClJJrVvqnbbg" name="Container p1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKWmkUggEeClJJrVvqnbbg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKYbwEggEeClJJrVvqnbbg" name="C1-1" tooltipText="p1.C1-1" outgoingEdges="_nKkB8EggEeClJJrVvqnbbg _nKkpAEggEeClJJrVvqnbbg">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKZC0EggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKZC2EggEeClJJrVvqnbbg" name="C1-2" tooltipText="p1.C1-2" incomingEdges="_nKkB8EggEeClJJrVvqnbbg">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKZp4EggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKZp6EggEeClJJrVvqnbbg" name="C1-3" tooltipText="p1.C1-3">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKZp6UggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
+        <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_nKa4AEggEeClJJrVvqnbbg" name="m1" tooltipText="m1() : ">
+          <target xmi:type="ecore:EOperation" href="My.ecore#//p1/C1-3/m1"/>
+          <semanticElements xmi:type="ecore:EOperation" href="My.ecore#//p1/C1-3/m1"/>
+          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKa4AUggEeClJJrVvqnbbg" labelSize="10">
+            <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/>
+          </ownedStyle>
+          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/>
+        </ownedElements>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKbfE0ggEeClJJrVvqnbbg" name="Container p1-1">
+        <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKbfFEggEeClJJrVvqnbbg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKXNoEggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKXNoUggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKWmlUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
-        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKYbwEggEeClJJrVvqnbbg" name="C1-1" tooltipText="p1.C1-1" outgoingEdges="_nKkB8EggEeClJJrVvqnbbg _nKkpAEggEeClJJrVvqnbbg">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKZC0EggEeClJJrVvqnbbg" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKZC1UggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKZC1kggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKZC10ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKZC1EggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKZC2EggEeClJJrVvqnbbg" name="C1-2" tooltipText="p1.C1-2" incomingEdges="_nKkB8EggEeClJJrVvqnbbg">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKZp4EggEeClJJrVvqnbbg" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKZp5UggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKZp5kggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKZp50ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKZp5EggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKZp6EggEeClJJrVvqnbbg" name="C1-3" tooltipText="p1.C1-3">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKZp6UggEeClJJrVvqnbbg" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKZp7kggEeClJJrVvqnbbg"/>
+        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKctM0ggEeClJJrVvqnbbg" name="C1-1-1" tooltipText="p1-1.C1-1-1" incomingEdges="_nKkpAEggEeClJJrVvqnbbg">
+          <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKctNEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
             <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKaQ8EggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKaQ8UggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKZp7UggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
           </ownedStyle>
           <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
-          <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_nKa4AEggEeClJJrVvqnbbg" name="m1" tooltipText="m1() : ">
-            <target xmi:type="ecore:EOperation" href="My.ecore#//p1/C1-3/m1"/>
-            <semanticElements xmi:type="ecore:EOperation" href="My.ecore#//p1/C1-3/m1"/>
-            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKa4AUggEeClJJrVvqnbbg" labelSize="10">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKbfEEggEeClJJrVvqnbbg"/>
+          <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_nKd7UEggEeClJJrVvqnbbg" name="m1" tooltipText="m1() : ">
+            <target xmi:type="ecore:EOperation" href="My.ecore#//p1/p1-1/C1-1-1/m1"/>
+            <semanticElements xmi:type="ecore:EOperation" href="My.ecore#//p1/p1-1/C1-1-1/m1"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKd7UUggEeClJJrVvqnbbg" labelSize="10">
               <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKbfEUggEeClJJrVvqnbbg"/>
-              <color xmi:type="viewpoint:RGBValues" xmi:id="_nKbfEkggEeClJJrVvqnbbg"/>
             </ownedStyle>
             <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/>
           </ownedElements>
         </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKbfE0ggEeClJJrVvqnbbg" name="Container p1-1">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKbfFEggEeClJJrVvqnbbg" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKbfGUggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKbfGkggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKbfG0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKbfGEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
-          <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKctM0ggEeClJJrVvqnbbg" name="C1-1-1" tooltipText="p1-1.C1-1-1" incomingEdges="_nKkpAEggEeClJJrVvqnbbg">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-            <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKctNEggEeClJJrVvqnbbg" backgroundStyle="GradientTopToBottom">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKdUQEggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKdUQUggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKdUQkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-              <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKctOEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
-            <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_nKd7UEggEeClJJrVvqnbbg" name="m1" tooltipText="m1() : ">
-              <target xmi:type="ecore:EOperation" href="My.ecore#//p1/p1-1/C1-1-1/m1"/>
-              <semanticElements xmi:type="ecore:EOperation" href="My.ecore#//p1/p1-1/C1-1-1/m1"/>
-              <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKd7UUggEeClJJrVvqnbbg" labelSize="10">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKd7VUggEeClJJrVvqnbbg"/>
-                <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKeiYEggEeClJJrVvqnbbg"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_nKeiYUggEeClJJrVvqnbbg"/>
-              </ownedStyle>
-              <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/>
-            </ownedElements>
-          </ownedDiagramElements>
-          <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKdUQ0ggEeClJJrVvqnbbg" name="C1-1-2" tooltipText="p1-1.C1-1-2">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-            <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKdUREggEeClJJrVvqnbbg" backgroundStyle="GradientTopToBottom">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKdUSUggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKdUSkggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKdUS0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-              <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKdUSEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
-          </ownedDiagramElements>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKcGIEggEeClJJrVvqnbbg" name="Container p1-2">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKcGIUggEeClJJrVvqnbbg" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKcGJkggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKcGJ0ggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKcGKEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKcGJUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
-          <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKeiYkggEeClJJrVvqnbbg" name="C1-2-1" tooltipText="p1-2.C1-2-1">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-            <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKfJcEggEeClJJrVvqnbbg" backgroundStyle="GradientTopToBottom">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKfJdUggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKfJdkggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKfJd0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-              <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKfJdEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
-          </ownedDiagramElements>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKcGKUggEeClJJrVvqnbbg" name="Container p1-3">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKcGKkggEeClJJrVvqnbbg" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKctMEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKctMUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKctMkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKcGLkggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKdUQ0ggEeClJJrVvqnbbg" name="C1-1-2" tooltipText="p1-1.C1-1-2">
+          <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKdUREggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
+          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
         </ownedDiagramElements>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKXNokggEeClJJrVvqnbbg" name="Container p2">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKXNo0ggEeClJJrVvqnbbg" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKXNqEggEeClJJrVvqnbbg"/>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKcGIEggEeClJJrVvqnbbg" name="Container p1-2">
+        <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
+        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKcGIUggEeClJJrVvqnbbg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKXNqUggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKXNqkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKXNp0ggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKfwgEggEeClJJrVvqnbbg" name="Container p2-1">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKgXkEggEeClJJrVvqnbbg" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKgXlUggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKgXlkggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKgXl0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKgXlEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
-          <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKg-o0ggEeClJJrVvqnbbg" name="new EClass 1" tooltipText="p2-1.new EClass 1">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-            <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKhlsEggEeClJJrVvqnbbg" backgroundStyle="GradientTopToBottom">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKhltUggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKhltkggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKhlt0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-              <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKhltEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
-            <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_nKiMwEggEeClJJrVvqnbbg" name="m1" tooltipText="m1() : ">
-              <target xmi:type="ecore:EOperation" href="My.ecore#//p2/p2-1/new%20EClass%201/m1"/>
-              <semanticElements xmi:type="ecore:EOperation" href="My.ecore#//p2/p2-1/new%20EClass%201/m1"/>
-              <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKiMwUggEeClJJrVvqnbbg" labelSize="10">
-                <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKiz0EggEeClJJrVvqnbbg"/>
-                <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/>
-                <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKiz0UggEeClJJrVvqnbbg"/>
-                <color xmi:type="viewpoint:RGBValues" xmi:id="_nKiz0kggEeClJJrVvqnbbg"/>
-              </ownedStyle>
-              <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/>
-            </ownedElements>
-          </ownedDiagramElements>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKgXmEggEeClJJrVvqnbbg" name="Container p2-2">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKgXmUggEeClJJrVvqnbbg" labelSize="10" backgroundStyle="GradientTopToBottom">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKg-oEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKg-oUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKg-okggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKgXnUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKeiYkggEeClJJrVvqnbbg" name="C1-2-1" tooltipText="p1-2.C1-2-1">
+          <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKfJcEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
+          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
         </ownedDiagramElements>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKXNq0ggEeClJJrVvqnbbg" name="Container p3">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKX0sEggEeClJJrVvqnbbg" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKX0tUggEeClJJrVvqnbbg"/>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKcGKUggEeClJJrVvqnbbg" name="Container p1-3">
+        <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
+        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKcGKkggEeClJJrVvqnbbg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKX0tkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKX0t0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKX0tEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKX0uEggEeClJJrVvqnbbg" name="Container p4">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKX0uUggEeClJJrVvqnbbg" labelSize="10" backgroundStyle="GradientTopToBottom">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKX0vkggEeClJJrVvqnbbg"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKXNokggEeClJJrVvqnbbg" name="Container p2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKXNo0ggEeClJJrVvqnbbg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKfwgEggEeClJJrVvqnbbg" name="Container p2-1">
+        <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
+        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKgXkEggEeClJJrVvqnbbg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
           <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKX0v0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKX0wEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKX0vUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nKkB8EggEeClJJrVvqnbbg" name="aC1-2" sourceNode="_nKYbwEggEeClJJrVvqnbbg" targetNode="_nKZC2EggEeClJJrVvqnbbg">
-        <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
-        <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_P5gJ8c-cEd6r8-xS3EkADw">
-          <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_P5gJ8s-cEd6r8-xS3EkADw" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOckggEeClJJrVvqnbbg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_l1zOc0ggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </centerLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nKkpAEggEeClJJrVvqnbbg" name="aC1-1-1" sourceNode="_nKYbwEggEeClJJrVvqnbbg" targetNode="_nKctM0ggEeClJJrVvqnbbg">
-        <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
-        <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_U661Yc-cEd6r8-xS3EkADw">
-          <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_U661Ys-cEd6r8-xS3EkADw" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOdkggEeClJJrVvqnbbg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_l1zOd0ggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </centerLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_R0qkUc4WEd6bS_KBCUv05A"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_yQmosM9qEd6bdqQ-rTRGJg" name="DiagType3 of MyPackage">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67nioBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_yQn20M9qEd6bdqQ-rTRGJg" type="Sirius" element="_yQmosM9qEd6bdqQ-rTRGJg" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_L0c88M-YEd6r8-xS3EkADw" type="2001" element="_nKkpBUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_L0dkAM-YEd6r8-xS3EkADw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_L0dkAc-YEd6r8-xS3EkADw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_L0gAQM-YEd6r8-xS3EkADw" type="3003" element="_nKlQEEggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_L0gAQc-YEd6r8-xS3EkADw" fontName="Sans"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0gAQs-YEd6r8-xS3EkADw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_L0c88c-YEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XPHUoN9KEd62yq234upbUg" x="-20" y="80" width="893" height="273"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_L0dkAs-YEd6r8-xS3EkADw" type="2001" element="_nKlQF0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_L0eLEM-YEd6r8-xS3EkADw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_L0eLEc-YEd6r8-xS3EkADw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_L0gnUM-YEd6r8-xS3EkADw" type="3003" element="_nKlQGEggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_L0gnUc-YEd6r8-xS3EkADw" fontName="Sans"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0gnUs-YEd6r8-xS3EkADw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_L0dkA8-YEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0dkBM-YEd6r8-xS3EkADw" x="120" y="30" width="30" height="30"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_L0eLEs-YEd6r8-xS3EkADw" type="2001" element="_nKl3IUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_L0eLFc-YEd6r8-xS3EkADw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_L0eLFs-YEd6r8-xS3EkADw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_L0hOYM-YEd6r8-xS3EkADw" type="3003" element="_nKl3IkggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_L0hOYc-YEd6r8-xS3EkADw" fontName="Sans"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0hOYs-YEd6r8-xS3EkADw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_L0eLE8-YEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0eLFM-YEd6r8-xS3EkADw" x="210" y="30" width="30" height="30"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_L0eyIM-YEd6r8-xS3EkADw" type="2001" element="_nKl3KUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_L0eyI8-YEd6r8-xS3EkADw" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_L0eyJM-YEd6r8-xS3EkADw" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_L0h1cM-YEd6r8-xS3EkADw" type="3003" element="_nKl3KkggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_L0icgM-YEd6r8-xS3EkADw" fontName="Sans"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0icgc-YEd6r8-xS3EkADw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_L0eyIc-YEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0eyIs-YEd6r8-xS3EkADw" x="300" y="30" width="30" height="30"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_yQn20c9qEd6bdqQ-rTRGJg"/>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKkpBUggEeClJJrVvqnbbg" name="Node p1" width="3" height="3" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_nKlQEEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKlQFEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKlQFUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKlQFkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKlQF0ggEeClJJrVvqnbbg" name="Node p2" width="3" height="3" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_nKlQGEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKlQHEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKlQHUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKl3IEggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKl3IUggEeClJJrVvqnbbg" name="Node p3" width="3" height="3" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_nKl3IkggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKl3JkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKl3J0ggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKl3KEggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKl3KUggEeClJJrVvqnbbg" name="Node p4" width="3" height="3" resizeKind="NSEW">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <ownedStyle xmi:type="diagram:Square" xmi:id="_nKl3KkggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKmeMEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKmeMUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKmeMkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_yQmosc9qEd6bdqQ-rTRGJg"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_8IynYN8kEd6puriA092P2A" name="DiagType5 of MyPackage">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67oJsBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_8LIJsN8kEd6puriA092P2A" type="Sirius" element="_8IynYN8kEd6puriA092P2A" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_8Ozv0N8kEd6puriA092P2A" type="2001" element="_nKmeM0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_8O52cN8kEd6puriA092P2A" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8O52cd8kEd6puriA092P2A" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_8PEOgN8kEd6puriA092P2A" type="3016">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_8PEOgd8kEd6puriA092P2A" fontName="Sans"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PEOgt8kEd6puriA092P2A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_8Ozv0d8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XwYOoN9KEd62yq234upbUg" x="299" y="278" width="96" height="35"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8O7EkN8kEd6puriA092P2A" type="2001" element="_nKnFR0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_8O7roN8kEd6puriA092P2A" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8O7rod8kEd6puriA092P2A" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_8PGDsN8kEd6puriA092P2A" type="3016">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_8PGDsd8kEd6puriA092P2A" fontName="Sans"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PGDst8kEd6puriA092P2A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_8O7Ekd8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XwY1sN9KEd62yq234upbUg" x="319" y="148" width="76" height="35"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8O8SsN8kEd6puriA092P2A" type="2001" element="_nKnsU0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_8O85wN8kEd6puriA092P2A" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8O85wd8kEd6puriA092P2A" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_8PH44N8kEd6puriA092P2A" type="3016">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_8PH44d8kEd6puriA092P2A" fontName="Sans"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PH44t8kEd6puriA092P2A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_8O8Ssd8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XwZcwN9KEd62yq234upbUg" x="95" y="148" width="102" height="63"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8O-H4N8kEd6puriA092P2A" type="2001" element="_nKnsW0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_8O-u8N8kEd6puriA092P2A" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8O-u8d8kEd6puriA092P2A" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_8PJuEN8kEd6puriA092P2A" type="3016">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_8PJuEd8kEd6puriA092P2A" fontName="Sans"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PJuEt8kEd6puriA092P2A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_8O-H4d8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8O-H4t8kEd6puriA092P2A" x="450" width="30" height="30"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8O_WAN8kEd6puriA092P2A" type="2001" element="_nKoTZ0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_8O_9EN8kEd6puriA092P2A" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8O_9Ed8kEd6puriA092P2A" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_8PLjQN8kEd6puriA092P2A" type="3016">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_8PLjQd8kEd6puriA092P2A" fontName="Sans"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PLjQt8kEd6puriA092P2A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_8O_WAd8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8O_WAt8kEd6puriA092P2A" x="540" width="30" height="30"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_8PBLMN8kEd6puriA092P2A" type="2001" element="_nKo6c0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_8PByQN8kEd6puriA092P2A" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_8PByQd8kEd6puriA092P2A" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_8PN_gN8kEd6puriA092P2A" type="3016">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_8PN_gd8kEd6puriA092P2A" fontName="Sans"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PN_gt8kEd6puriA092P2A"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_8PBLMd8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PBLMt8kEd6puriA092P2A" x="630" width="30" height="30"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_tgLzMO8SEd6XKL8iki2fzg" type="2001" element="_nKo6e0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_tgNBUO8SEd6XKL8iki2fzg" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tgNBUe8SEd6XKL8iki2fzg" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_tgO2gO8SEd6XKL8iki2fzg" type="3016">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_tgO2ge8SEd6XKL8iki2fzg" fontName="Segoe UI"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tgO2gu8SEd6XKL8iki2fzg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_tgLzMe8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tgLzMu8SEd6XKL8iki2fzg"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_8LIJsd8kEd6puriA092P2A"/>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKmeM0ggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKnFQEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKnFREggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKnFRUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKnFRkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKnFR0ggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKnFSEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKnsUEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKnsUUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKnsUkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKnsU0ggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKnsVEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKnsWEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKnsWUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKnsWkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKnsW0ggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKoTYEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKoTZEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKoTZUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKoTZkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKoTZ0ggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKoTaEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKo6cEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKo6cUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKo6ckggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKo6c0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKo6dEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKo6eEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKo6eUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKo6ekggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKo6e0ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKphgEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKphhEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKphhUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKphhkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_8IynYd8kEd6puriA092P2A"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_QFauEN9KEd62yq234upbUg" name="DiagType4 of MyPackage">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67owwBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_QGazoN9KEd62yq234upbUg" type="Sirius" element="_QFauEN9KEd62yq234upbUg" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_QG8YEN9KEd62yq234upbUg" type="2002" element="_nKqIkEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_QG-NQN9KEd62yq234upbUg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_QG-0UN9KEd62yq234upbUg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_QG-0Ud9KEd62yq234upbUg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_QG-0Ut9KEd62yq234upbUg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_QG8YEd9KEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QG8YEt9KEd62yq234upbUg" width="245" height="80"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_QG_bYN9KEd62yq234upbUg" type="2002" element="_nKqImUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_QHACcN9KEd62yq234upbUg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_QHACcd9KEd62yq234upbUg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_QHACct9KEd62yq234upbUg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_QHACc99KEd62yq234upbUg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_QG_bYd9KEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QG_bYt9KEd62yq234upbUg" x="319" width="260" height="80"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_QHACdN9KEd62yq234upbUg" type="2002" element="_nKqvqEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_QHApgN9KEd62yq234upbUg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_QHApgd9KEd62yq234upbUg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_QHApgt9KEd62yq234upbUg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_QHApg99KEd62yq234upbUg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_QHACdd9KEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHACdt9KEd62yq234upbUg" x="649" width="245" height="80"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_QHAphN9KEd62yq234upbUg" type="2002" element="_nKqvsUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_QHAph99KEd62yq234upbUg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_QHBQkN9KEd62yq234upbUg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_QHBQkd9KEd62yq234upbUg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_QHBQkt9KEd62yq234upbUg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_QHAphd9KEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHApht9KEd62yq234upbUg" x="935" width="223" height="80"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_QGazod9KEd62yq234upbUg"/>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKqIkEggEeClJJrVvqnbbg" name="Container without children p1">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKqIkUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqIlkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqIl0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqImEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqIlUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKqImUggEeClJJrVvqnbbg" name="Container without children p2">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKqvoEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqvpUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqvpkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqvp0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqvpEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKqvqEggEeClJJrVvqnbbg" name="Container without children p3">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKqvqUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqvrkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqvr0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqvsEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKqvrUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKqvsUggEeClJJrVvqnbbg" name="Container without children p4">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKrWsEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKrWtUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKrWtkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKrWt0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKrWtEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_QFauEd9KEd62yq234upbUg"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_RLK_wd9LEd62yq234upbUg" name="DiagType6 of MyPackage">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67pX0BFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_RLLm0N9LEd62yq234upbUg" type="Sirius" element="_RLK_wd9LEd62yq234upbUg" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_RLVX0N9LEd62yq234upbUg" type="2001" element="_nKsk0EggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_RLV-4N9LEd62yq234upbUg" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_RLV-4d9LEd62yq234upbUg" x="120" y="-15"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_RMcLEN9LEd62yq234upbUg" type="3001" element="_nKvoIkggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_RMdZMN9LEd62yq234upbUg" type="5001">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_RMdZMd9LEd62yq234upbUg" x="-44" y="1"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_RMjf0N9LEd62yq234upbUg" type="3003" element="_nKvoI0ggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_RMjf0d9LEd62yq234upbUg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RMjf0t9LEd62yq234upbUg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_RMcyIN9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_jN4eWnEd6JMo4lxOczEg" x="8" y="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_RMdZMt9LEd62yq234upbUg" type="3001" element="_nKwPMUggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_RMdZNd9LEd62yq234upbUg" type="5001">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_RMdZNt9LEd62yq234upbUg" x="1" y="29"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_RMq0kN9LEd62yq234upbUg" type="3003" element="_nKwPMkggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_RMq0kd9LEd62yq234upbUg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RMq0kt9LEd62yq234upbUg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_RMdZM99LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_j08OWnEd6JMo4lxOczEg" x="18" y="10" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ubs7MDV0EeK3CJPJKDfW0g" type="3016" element="_nKsk0UggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ubs7MTV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubs7MjV0EeK3CJPJKDfW0g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_RLVX0d9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_jN4OWnEd6JMo4lxOczEg" x="169" y="89" width="61" height="18"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_RLWl8N9LEd62yq234upbUg" type="2001" element="_nKsk2EggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_RLWl899LEd62yq234upbUg" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_RLWl9N9LEd62yq234upbUg" x="-41" y="18"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ubuwYDV0EeK3CJPJKDfW0g" type="3016" element="_nKtL4EggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ubuwYTV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubuwYjV0EeK3CJPJKDfW0g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_RLWl8d9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_j08eWnEd6JMo4lxOczEg" x="481" y="77" width="30" height="30"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_RLXNAN9LEd62yq234upbUg" type="2001" element="_nKtL50ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_RLXNA99LEd62yq234upbUg" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_RLXNBN9LEd62yq234upbUg" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ubxMoDV0EeK3CJPJKDfW0g" type="3016" element="_nKtL6EggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ubxMoTV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubxMojV0EeK3CJPJKDfW0g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_RLXNAd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_kcAOWnEd6JMo4lxOczEg" x="66" y="187" width="30" height="30"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_RLhlEN9LEd62yq234upbUg" type="2001" element="_nKty8UggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_RLhlE99LEd62yq234upbUg" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_RLhlFN9LEd62yq234upbUg" x="57" y="4"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ubyawDV0EeK3CJPJKDfW0g" type="3016" element="_nKty8kggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ubyawTV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubyawjV0EeK3CJPJKDfW0g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_RLhlEd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_kcAeWnEd6JMo4lxOczEg" x="267" y="25" width="30" height="30"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_RLiMIN9LEd62yq234upbUg" type="2001" element="_nKty-UggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_RLizMN9LEd62yq234upbUg" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_RLizMd9LEd62yq234upbUg" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ub0P8DV0EeK3CJPJKDfW0g" type="3016" element="_nKuaAEggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ub0P8TV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ub0P8jV0EeK3CJPJKDfW0g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_RLiMId9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_lDEOWnEd6JMo4lxOczEg" x="109" y="25" width="30" height="30"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_RLizMt9LEd62yq234upbUg" type="2001" element="_nKuaB0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_RLjaQN9LEd62yq234upbUg" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_RLjaQd9LEd62yq234upbUg" y="5"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ub2FIDV0EeK3CJPJKDfW0g" type="3016" element="_nKvBEEggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ub2FITV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ub2FIjV0EeK3CJPJKDfW0g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_RLizM99LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_lDEeWnEd6JMo4lxOczEg" x="539" y="219" width="30" height="30"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_twECQO8SEd6XKL8iki2fzg" type="2001" element="_nKvBF0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_twECQ-8SEd6XKL8iki2fzg" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_twECRO8SEd6XKL8iki2fzg" x="-79"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ub36UDV0EeK3CJPJKDfW0g" type="3016" element="_nKvBGEggEeClJJrVvqnbbg">
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ub36UTV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ub36UjV0EeK3CJPJKDfW0g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_twECQe8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_twECQu8SEd6XKL8iki2fzg" x="119" y="55" width="30" height="30"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_RLLm0d9LEd62yq234upbUg"/>
-          <edges xmi:type="notation:Edge" xmi:id="_McBLIOAeEd6Bs8eDPsJ8Gg" type="4001" element="_nKxdUEggEeClJJrVvqnbbg" source="_RLVX0N9LEd62yq234upbUg" target="_RLWl8N9LEd62yq234upbUg">
-            <children xmi:type="notation:Node" xmi:id="_McEOcOAeEd6Bs8eDPsJ8Gg" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwMlkfxAEd6MWOf7z4LcAg" x="7" y="21" width="32" height="22"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oAu3gJkKEeCez7uszjfVoA" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAu3gZkKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oA4BcJkKEeCez7uszjfVoA" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oA4BcZkKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_McBLIeAeEd6Bs8eDPsJ8Gg"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_McBLIuAeEd6Bs8eDPsJ8Gg" fontName="Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IS1iMuPiEd6yD77yB6m-yA" points="[33, 17, -271, 2]$[116, 60, -188, 45]$[246, 60, -58, 45]$[302, 17, -2, 2]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IS1iMOPiEd6yD77yB6m-yA" id="(0.8032786885245902,0.1111111111111111)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IS1iMePiEd6yD77yB6m-yA" id="(0.5333333333333333,0.8)"/>
-          </edges>
-          <edges xmi:type="notation:Edge" xmi:id="_McFckOAeEd6Bs8eDPsJ8Gg" type="4001" element="_nKyEYEggEeClJJrVvqnbbg" source="_RLVX0N9LEd62yq234upbUg" target="_RLhlEN9LEd62yq234upbUg">
-            <children xmi:type="notation:Node" xmi:id="_McGDoOAeEd6Bs8eDPsJ8Gg" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0cFbMPxAEd6MWOf7z4LcAg" x="19" y="-15" width="43" height="20"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oA4BcpkKEeCez7uszjfVoA" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oA4Bc5kKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oA4BdJkKEeCez7uszjfVoA" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oA4BdZkKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_McFckeAeEd6Bs8eDPsJ8Gg"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_McFckuAeEd6Bs8eDPsJ8Gg" fontName="Sans" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AFy_ouMvEd6-9o13rm0rUA" points="[0, -1, -72, 50]$[0, -45, -72, 6]$[67, -45, -5, 6]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AFy_oOMvEd6-9o13rm0rUA" id="(0.5081967213114754,0.05555555555555555)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AFy_oeMvEd6-9o13rm0rUA" id="(0.16666666666666666,0.4666666666666667)"/>
-          </edges>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKsk0EggEeClJJrVvqnbbg" name="C1-1" outgoingEdges="_nKxdUEggEeClJJrVvqnbbg _nKyEYEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nKvoIkggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_nKvoI0ggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKvoJ0ggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@borderedNodeMappings[name='DT6_ClassInRelation']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKvoKEggEeClJJrVvqnbbg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_nKwPMEggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@borderedNodeMappings[name='DT6_ClassInRelation']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nKwPMUggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-          <ownedStyle xmi:type="diagram:Square" xmi:id="_nKwPMkggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKwPNkggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@borderedNodeMappings[name='DT6_ClassInRelation']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKwPN0ggEeClJJrVvqnbbg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_nKwPOEggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+        <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_nKg-o0ggEeClJJrVvqnbbg" name="new EClass 1" tooltipText="p2-1.new EClass 1">
+          <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKhlsEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@borderedNodeMappings[name='DT6_ClassInRelation']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKsk0UggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKsk1UggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKsk1kggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKsk10ggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']"/>
+          <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_nKiMwEggEeClJJrVvqnbbg" name="m1" tooltipText="m1() : ">
+            <target xmi:type="ecore:EOperation" href="My.ecore#//p2/p2-1/new%20EClass%201/m1"/>
+            <semanticElements xmi:type="ecore:EOperation" href="My.ecore#//p2/p2-1/new%20EClass%201/m1"/>
+            <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nKiMwUggEeClJJrVvqnbbg" labelSize="10">
+              <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']/@style"/>
+            </ownedStyle>
+            <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@subContainerMappings[name='DT2_Class']/@subNodeMappings[name='DT2_Operation']"/>
+          </ownedElements>
+        </ownedDiagramElements>
+      </ownedDiagramElements>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKgXmEggEeClJJrVvqnbbg" name="Container p2-2">
+        <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
+        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKgXmUggEeClJJrVvqnbbg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKsk2EggEeClJJrVvqnbbg" name="C1-2" incomingEdges="_nKxdUEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="EAST_WEST">
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKXNq0ggEeClJJrVvqnbbg" name="Container p3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKX0sEggEeClJJrVvqnbbg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKX0uEggEeClJJrVvqnbbg" name="Container p4">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKX0uUggEeClJJrVvqnbbg" labelSize="10" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@containerMappings[name='DT2_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nKkB8EggEeClJJrVvqnbbg" name="aC1-2" sourceNode="_nKYbwEggEeClJJrVvqnbbg" targetNode="_nKZC2EggEeClJJrVvqnbbg">
+      <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_P5gJ8c-cEd6r8-xS3EkADw">
+        <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOckggEeClJJrVvqnbbg" showIcon="false" labelColor="209,209,209"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nKkpAEggEeClJJrVvqnbbg" name="aC1-1-1" sourceNode="_nKYbwEggEeClJJrVvqnbbg" targetNode="_nKctM0ggEeClJJrVvqnbbg">
+      <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
+      <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_U661Yc-cEd6r8-xS3EkADw">
+        <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOdkggEeClJJrVvqnbbg" showIcon="false" labelColor="209,209,209"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']/@edgeMappings[name='DT2_EReference']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType2']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_R0qkUc4WEd6bS_KBCUv05A"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_yQmosM9qEd6bdqQ-rTRGJg" name="DiagType3 of MyPackage">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67nioBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_yQn20M9qEd6bdqQ-rTRGJg" type="Sirius" element="_yQmosM9qEd6bdqQ-rTRGJg" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_L0c88M-YEd6r8-xS3EkADw" type="2001" element="_nKkpBUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_L0dkAM-YEd6r8-xS3EkADw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_L0dkAc-YEd6r8-xS3EkADw" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_L0gAQM-YEd6r8-xS3EkADw" type="3003" element="_nKlQEEggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_L0gAQc-YEd6r8-xS3EkADw" fontName="Sans"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0gAQs-YEd6r8-xS3EkADw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_L0c88c-YEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XPHUoN9KEd62yq234upbUg" x="-20" y="80" width="893" height="273"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_L0dkAs-YEd6r8-xS3EkADw" type="2001" element="_nKlQF0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_L0eLEM-YEd6r8-xS3EkADw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_L0eLEc-YEd6r8-xS3EkADw" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_L0gnUM-YEd6r8-xS3EkADw" type="3003" element="_nKlQGEggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_L0gnUc-YEd6r8-xS3EkADw" fontName="Sans"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0gnUs-YEd6r8-xS3EkADw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_L0dkA8-YEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0dkBM-YEd6r8-xS3EkADw" x="120" y="30" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_L0eLEs-YEd6r8-xS3EkADw" type="2001" element="_nKl3IUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_L0eLFc-YEd6r8-xS3EkADw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_L0eLFs-YEd6r8-xS3EkADw" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_L0hOYM-YEd6r8-xS3EkADw" type="3003" element="_nKl3IkggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_L0hOYc-YEd6r8-xS3EkADw" fontName="Sans"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0hOYs-YEd6r8-xS3EkADw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_L0eLE8-YEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0eLFM-YEd6r8-xS3EkADw" x="210" y="30" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_L0eyIM-YEd6r8-xS3EkADw" type="2001" element="_nKl3KUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_L0eyI8-YEd6r8-xS3EkADw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_L0eyJM-YEd6r8-xS3EkADw" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_L0h1cM-YEd6r8-xS3EkADw" type="3003" element="_nKl3KkggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_L0icgM-YEd6r8-xS3EkADw" fontName="Sans"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0icgc-YEd6r8-xS3EkADw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_L0eyIc-YEd6r8-xS3EkADw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L0eyIs-YEd6r8-xS3EkADw" x="300" y="30" width="30" height="30"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_yQn20c9qEd6bdqQ-rTRGJg"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd4rDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd47DFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKkpBUggEeClJJrVvqnbbg" name="Node p1" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <ownedStyle xmi:type="diagram:Square" xmi:id="_nKlQEEggEeClJJrVvqnbbg">
+        <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKlQF0ggEeClJJrVvqnbbg" name="Node p2" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <ownedStyle xmi:type="diagram:Square" xmi:id="_nKlQGEggEeClJJrVvqnbbg">
+        <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKl3IUggEeClJJrVvqnbbg" name="Node p3" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedStyle xmi:type="diagram:Square" xmi:id="_nKl3IkggEeClJJrVvqnbbg">
+        <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKl3KUggEeClJJrVvqnbbg" name="Node p4" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedStyle xmi:type="diagram:Square" xmi:id="_nKl3KkggEeClJJrVvqnbbg">
+        <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']/@nodeMappings[name='DT3_Package']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType3']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_yQmosc9qEd6bdqQ-rTRGJg"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_8IynYN8kEd6puriA092P2A" name="DiagType5 of MyPackage">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67oJsBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_8LIJsN8kEd6puriA092P2A" type="Sirius" element="_8IynYN8kEd6puriA092P2A" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_8Ozv0N8kEd6puriA092P2A" type="2001" element="_nKmeM0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_8O52cN8kEd6puriA092P2A" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_8O52cd8kEd6puriA092P2A" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8PEOgN8kEd6puriA092P2A" type="3016">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_8PEOgd8kEd6puriA092P2A" fontName="Sans"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PEOgt8kEd6puriA092P2A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_8Ozv0d8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XwYOoN9KEd62yq234upbUg" x="299" y="278" width="96" height="35"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_8O7EkN8kEd6puriA092P2A" type="2001" element="_nKnFR0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_8O7roN8kEd6puriA092P2A" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_8O7rod8kEd6puriA092P2A" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8PGDsN8kEd6puriA092P2A" type="3016">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_8PGDsd8kEd6puriA092P2A" fontName="Sans"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PGDst8kEd6puriA092P2A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_8O7Ekd8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XwY1sN9KEd62yq234upbUg" x="319" y="148" width="76" height="35"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_8O8SsN8kEd6puriA092P2A" type="2001" element="_nKnsU0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_8O85wN8kEd6puriA092P2A" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_8O85wd8kEd6puriA092P2A" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8PH44N8kEd6puriA092P2A" type="3016">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_8PH44d8kEd6puriA092P2A" fontName="Sans"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PH44t8kEd6puriA092P2A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_8O8Ssd8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XwZcwN9KEd62yq234upbUg" x="95" y="148" width="102" height="63"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_8O-H4N8kEd6puriA092P2A" type="2001" element="_nKnsW0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_8O-u8N8kEd6puriA092P2A" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_8O-u8d8kEd6puriA092P2A" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8PJuEN8kEd6puriA092P2A" type="3016">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_8PJuEd8kEd6puriA092P2A" fontName="Sans"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PJuEt8kEd6puriA092P2A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_8O-H4d8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8O-H4t8kEd6puriA092P2A" x="450" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_8O_WAN8kEd6puriA092P2A" type="2001" element="_nKoTZ0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_8O_9EN8kEd6puriA092P2A" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_8O_9Ed8kEd6puriA092P2A" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8PLjQN8kEd6puriA092P2A" type="3016">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_8PLjQd8kEd6puriA092P2A" fontName="Sans"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PLjQt8kEd6puriA092P2A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_8O_WAd8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8O_WAt8kEd6puriA092P2A" x="540" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_8PBLMN8kEd6puriA092P2A" type="2001" element="_nKo6c0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_8PByQN8kEd6puriA092P2A" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_8PByQd8kEd6puriA092P2A" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_8PN_gN8kEd6puriA092P2A" type="3016">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_8PN_gd8kEd6puriA092P2A" fontName="Sans"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PN_gt8kEd6puriA092P2A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_8PBLMd8kEd6puriA092P2A" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8PBLMt8kEd6puriA092P2A" x="630" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_tgLzMO8SEd6XKL8iki2fzg" type="2001" element="_nKo6e0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_tgNBUO8SEd6XKL8iki2fzg" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_tgNBUe8SEd6XKL8iki2fzg" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_tgO2gO8SEd6XKL8iki2fzg" type="3016">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_tgO2ge8SEd6XKL8iki2fzg" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tgO2gu8SEd6XKL8iki2fzg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_tgLzMe8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tgLzMu8SEd6XKL8iki2fzg"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_8LIJsd8kEd6puriA092P2A"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd5LDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd5bDFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKmeM0ggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKnFQEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKnFR0ggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKnFSEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKnsU0ggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKnsVEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKnsW0ggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKoTYEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKoTZ0ggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKoTaEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKo6c0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKo6dEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKo6e0ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKphgEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']/@nodeMappings[name='DT5_Class']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType5']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_8IynYd8kEd6puriA092P2A"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_QFauEN9KEd62yq234upbUg" name="DiagType4 of MyPackage">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67owwBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_QGazoN9KEd62yq234upbUg" type="Sirius" element="_QFauEN9KEd62yq234upbUg" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_QG8YEN9KEd62yq234upbUg" type="2002" element="_nKqIkEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_QG-NQN9KEd62yq234upbUg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_QG-0UN9KEd62yq234upbUg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_QG-0Ud9KEd62yq234upbUg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_QG-0Ut9KEd62yq234upbUg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_QG8YEd9KEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QG8YEt9KEd62yq234upbUg" width="245" height="80"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_QG_bYN9KEd62yq234upbUg" type="2002" element="_nKqImUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_QHACcN9KEd62yq234upbUg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_QHACcd9KEd62yq234upbUg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_QHACct9KEd62yq234upbUg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_QHACc99KEd62yq234upbUg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_QG_bYd9KEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QG_bYt9KEd62yq234upbUg" x="319" width="260" height="80"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_QHACdN9KEd62yq234upbUg" type="2002" element="_nKqvqEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_QHApgN9KEd62yq234upbUg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_QHApgd9KEd62yq234upbUg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_QHApgt9KEd62yq234upbUg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_QHApg99KEd62yq234upbUg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_QHACdd9KEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHACdt9KEd62yq234upbUg" x="649" width="245" height="80"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_QHAphN9KEd62yq234upbUg" type="2002" element="_nKqvsUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_QHAph99KEd62yq234upbUg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_QHBQkN9KEd62yq234upbUg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_QHBQkd9KEd62yq234upbUg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_QHBQkt9KEd62yq234upbUg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_QHAphd9KEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHApht9KEd62yq234upbUg" x="935" width="223" height="80"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_QGazod9KEd62yq234upbUg"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd5rDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd57DFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKqIkEggEeClJJrVvqnbbg" name="Container without children p1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKqIkUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKqImUggEeClJJrVvqnbbg" name="Container without children p2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKqvoEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKqvqEggEeClJJrVvqnbbg" name="Container without children p3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKqvqUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKqvsUggEeClJJrVvqnbbg" name="Container without children p4">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKrWsEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']/@containerMappings[name='DT4_Package']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType4']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_QFauEd9KEd62yq234upbUg"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_RLK_wd9LEd62yq234upbUg" name="DiagType6 of MyPackage">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67pX0BFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_RLLm0N9LEd62yq234upbUg" type="Sirius" element="_RLK_wd9LEd62yq234upbUg" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_RLVX0N9LEd62yq234upbUg" type="2001" element="_nKsk0EggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_RLV-4N9LEd62yq234upbUg" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_RLV-4d9LEd62yq234upbUg" x="120" y="-15"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_RMcLEN9LEd62yq234upbUg" type="3001" element="_nKvoIkggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_RMdZMN9LEd62yq234upbUg" type="5001">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_RMdZMd9LEd62yq234upbUg" x="-44" y="1"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_RMjf0N9LEd62yq234upbUg" type="3003" element="_nKvoI0ggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_RMjf0d9LEd62yq234upbUg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RMjf0t9LEd62yq234upbUg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_RMcyIN9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_jN4eWnEd6JMo4lxOczEg" x="8" y="-22" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_RMdZMt9LEd62yq234upbUg" type="3001" element="_nKwPMUggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_RMdZNd9LEd62yq234upbUg" type="5001">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_RMdZNt9LEd62yq234upbUg" x="1" y="29"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_RMq0kN9LEd62yq234upbUg" type="3003" element="_nKwPMkggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_RMq0kd9LEd62yq234upbUg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RMq0kt9LEd62yq234upbUg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_RMdZM99LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_j08OWnEd6JMo4lxOczEg" x="18" y="10" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ubs7MDV0EeK3CJPJKDfW0g" type="3016" element="_nKsk0UggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ubs7MTV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubs7MjV0EeK3CJPJKDfW0g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_RLVX0d9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_jN4OWnEd6JMo4lxOczEg" x="169" y="89" width="61" height="18"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_RLWl8N9LEd62yq234upbUg" type="2001" element="_nKsk2EggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_RLWl899LEd62yq234upbUg" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_RLWl9N9LEd62yq234upbUg" x="-41" y="18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ubuwYDV0EeK3CJPJKDfW0g" type="3016" element="_nKtL4EggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ubuwYTV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubuwYjV0EeK3CJPJKDfW0g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_RLWl8d9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_j08eWnEd6JMo4lxOczEg" x="481" y="77" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_RLXNAN9LEd62yq234upbUg" type="2001" element="_nKtL50ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_RLXNA99LEd62yq234upbUg" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_RLXNBN9LEd62yq234upbUg" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ubxMoDV0EeK3CJPJKDfW0g" type="3016" element="_nKtL6EggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ubxMoTV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubxMojV0EeK3CJPJKDfW0g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_RLXNAd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_kcAOWnEd6JMo4lxOczEg" x="66" y="187" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_RLhlEN9LEd62yq234upbUg" type="2001" element="_nKty8UggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_RLhlE99LEd62yq234upbUg" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_RLhlFN9LEd62yq234upbUg" x="57" y="4"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ubyawDV0EeK3CJPJKDfW0g" type="3016" element="_nKty8kggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ubyawTV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubyawjV0EeK3CJPJKDfW0g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_RLhlEd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_kcAeWnEd6JMo4lxOczEg" x="267" y="25" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_RLiMIN9LEd62yq234upbUg" type="2001" element="_nKty-UggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_RLizMN9LEd62yq234upbUg" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_RLizMd9LEd62yq234upbUg" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ub0P8DV0EeK3CJPJKDfW0g" type="3016" element="_nKuaAEggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ub0P8TV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ub0P8jV0EeK3CJPJKDfW0g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_RLiMId9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_lDEOWnEd6JMo4lxOczEg" x="109" y="25" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_RLizMt9LEd62yq234upbUg" type="2001" element="_nKuaB0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_RLjaQN9LEd62yq234upbUg" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_RLjaQd9LEd62yq234upbUg" y="5"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ub2FIDV0EeK3CJPJKDfW0g" type="3016" element="_nKvBEEggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ub2FITV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ub2FIjV0EeK3CJPJKDfW0g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_RLizM99LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s_lDEeWnEd6JMo4lxOczEg" x="539" y="219" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_twECQO8SEd6XKL8iki2fzg" type="2001" element="_nKvBF0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_twECQ-8SEd6XKL8iki2fzg" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_twECRO8SEd6XKL8iki2fzg" x="-79"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ub36UDV0EeK3CJPJKDfW0g" type="3016" element="_nKvBGEggEeClJJrVvqnbbg">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ub36UTV0EeK3CJPJKDfW0g" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ub36UjV0EeK3CJPJKDfW0g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_twECQe8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_twECQu8SEd6XKL8iki2fzg" x="119" y="55" width="30" height="30"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_RLLm0d9LEd62yq234upbUg"/>
+        <edges xmi:type="notation:Edge" xmi:id="_McBLIOAeEd6Bs8eDPsJ8Gg" type="4001" element="_nKxdUEggEeClJJrVvqnbbg" source="_RLVX0N9LEd62yq234upbUg" target="_RLWl8N9LEd62yq234upbUg">
+          <children xmi:type="notation:Node" xmi:id="_McEOcOAeEd6Bs8eDPsJ8Gg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwMlkfxAEd6MWOf7z4LcAg" x="7" y="21" width="32" height="22"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oAu3gJkKEeCez7uszjfVoA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAu3gZkKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oA4BcJkKEeCez7uszjfVoA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oA4BcZkKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_McBLIeAeEd6Bs8eDPsJ8Gg"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_McBLIuAeEd6Bs8eDPsJ8Gg" fontName="Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IS1iMuPiEd6yD77yB6m-yA" points="[33, 17, -271, 2]$[116, 60, -188, 45]$[246, 60, -58, 45]$[302, 17, -2, 2]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IS1iMOPiEd6yD77yB6m-yA" id="(0.8032786885245902,0.1111111111111111)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IS1iMePiEd6yD77yB6m-yA" id="(0.5333333333333333,0.8)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_McFckOAeEd6Bs8eDPsJ8Gg" type="4001" element="_nKyEYEggEeClJJrVvqnbbg" source="_RLVX0N9LEd62yq234upbUg" target="_RLhlEN9LEd62yq234upbUg">
+          <children xmi:type="notation:Node" xmi:id="_McGDoOAeEd6Bs8eDPsJ8Gg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0cFbMPxAEd6MWOf7z4LcAg" x="19" y="-15" width="43" height="20"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oA4BcpkKEeCez7uszjfVoA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oA4Bc5kKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oA4BdJkKEeCez7uszjfVoA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oA4BdZkKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_McFckeAeEd6Bs8eDPsJ8Gg"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_McFckuAeEd6Bs8eDPsJ8Gg" fontName="Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AFy_ouMvEd6-9o13rm0rUA" points="[0, -1, -72, 50]$[0, -45, -72, 6]$[67, -45, -5, 6]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AFy_oOMvEd6-9o13rm0rUA" id="(0.5081967213114754,0.05555555555555555)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AFy_oeMvEd6-9o13rm0rUA" id="(0.16666666666666666,0.4666666666666667)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd6LDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd6bDFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKsk0EggEeClJJrVvqnbbg" name="C1-1" outgoingEdges="_nKxdUEggEeClJJrVvqnbbg _nKyEYEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nKvoIkggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="NSEW">
         <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
         <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKtL4EggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKtL5EggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKtL5UggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKtL5kggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKtL50ggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKtL6EggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKtL7EggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKtL7UggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKty8EggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_nKvoI0ggEeClJJrVvqnbbg">
+          <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@borderedNodeMappings[name='DT6_ClassInRelation']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKty8UggEeClJJrVvqnbbg" name="C1-1-1" incomingEdges="_nKyEYEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="EAST_WEST">
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@borderedNodeMappings[name='DT6_ClassInRelation']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nKwPMUggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="NSEW">
         <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
         <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKty8kggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKty9kggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKty90ggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKty-EggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKty-UggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKuaAEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKuaBEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKuaBUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKuaBkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKuaB0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKvBEEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKvBFEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKvBFUggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKvBFkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKvBF0ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="EAST_WEST">
-        <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-        <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKvBGEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKvBHEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKvoIEggEeClJJrVvqnbbg"/>
-          <color xmi:type="viewpoint:RGBValues" xmi:id="_nKvoIUggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nKxdUEggEeClJJrVvqnbbg" name="aC1-2" sourceNode="_nKsk0EggEeClJJrVvqnbbg" targetNode="_nKsk2EggEeClJJrVvqnbbg">
-        <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
-        <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MbKPguAeEd6Bs8eDPsJ8Gg">
-          <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@edgeMappings[name='DT6_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_MbKPg-AeEd6Bs8eDPsJ8Gg" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOcEggEeClJJrVvqnbbg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ubVu0DV0EeK3CJPJKDfW0g"/>
-          </centerLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@edgeMappings[name='DT6_EReference']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nKyEYEggEeClJJrVvqnbbg" name="aC1-1-1" sourceNode="_nKsk0EggEeClJJrVvqnbbg" targetNode="_nKty8UggEeClJJrVvqnbbg">
-        <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
-        <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MbPIAeAeEd6Bs8eDPsJ8Gg">
-          <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@edgeMappings[name='DT6_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_MbPIAuAeEd6Bs8eDPsJ8Gg" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOekggEeClJJrVvqnbbg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ubWV4DV0EeK3CJPJKDfW0g"/>
-          </centerLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@edgeMappings[name='DT6_EReference']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_RLK_wt9LEd62yq234upbUg"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_XI_pEd9LEd62yq234upbUg" name="DiagType7 of MyPackage">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67p-4BFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_XJA3MN9LEd62yq234upbUg" type="Sirius" element="_XI_pEd9LEd62yq234upbUg" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_XJWOYN9LEd62yq234upbUg" type="2002" element="_nKyEZUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_XJWOY99LEd62yq234upbUg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_XJWOZN9LEd62yq234upbUg" type="7001">
-              <children xmi:type="notation:Node" xmi:id="_EvK8oN9MEd62yq234upbUg" type="3008" element="_nK1Hs0ggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_EvLjsN9MEd62yq234upbUg" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_EvMKwN9MEd62yq234upbUg" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_EvMKwd9MEd62yq234upbUg"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_EvMKwt9MEd62yq234upbUg"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_EvOnAN9MEd62yq234upbUg" type="3012" element="_nK2V0EggEeClJJrVvqnbbg">
-                  <children xmi:type="notation:Node" xmi:id="_EvOnA99MEd62yq234upbUg" type="5010">
-                    <layoutConstraint xmi:type="notation:Location" xmi:id="_EvOnBN9MEd62yq234upbUg" y="5"/>
-                  </children>
-                  <children xmi:type="notation:Node" xmi:id="_EvRqUN9MEd62yq234upbUg" type="3002" element="_nK2V0UggEeClJJrVvqnbbg">
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_EvRqUd9MEd62yq234upbUg" fontName="Sans"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EvRqUt9MEd62yq234upbUg"/>
-                  </children>
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_EvOnAd9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LkeseADEd6J-94GVlGYcA" x="189" y="32" width="30" height="30"/>
+        <ownedStyle xmi:type="diagram:Square" xmi:id="_nKwPMkggEeClJJrVvqnbbg">
+          <description xmi:type="style:SquareDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@borderedNodeMappings[name='DT6_ClassInRelation']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@borderedNodeMappings[name='DT6_ClassInRelation']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKsk0UggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKsk2EggEeClJJrVvqnbbg" name="C1-2" incomingEdges="_nKxdUEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKtL4EggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKtL50ggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKtL6EggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKty8UggEeClJJrVvqnbbg" name="C1-1-1" incomingEdges="_nKyEYEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKty8kggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKty-UggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKuaAEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKuaB0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKvBEEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nKvBF0ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_nKvBGEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@nodeMappings[name='DT6_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nKxdUEggEeClJJrVvqnbbg" name="aC1-2" sourceNode="_nKsk0EggEeClJJrVvqnbbg" targetNode="_nKsk2EggEeClJJrVvqnbbg">
+      <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MbKPguAeEd6Bs8eDPsJ8Gg">
+        <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@edgeMappings[name='DT6_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOcEggEeClJJrVvqnbbg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@edgeMappings[name='DT6_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nKyEYEggEeClJJrVvqnbbg" name="aC1-1-1" sourceNode="_nKsk0EggEeClJJrVvqnbbg" targetNode="_nKty8UggEeClJJrVvqnbbg">
+      <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
+      <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MbPIAeAeEd6Bs8eDPsJ8Gg">
+        <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@edgeMappings[name='DT6_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOekggEeClJJrVvqnbbg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']/@edgeMappings[name='DT6_EReference']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType6']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_RLK_wt9LEd62yq234upbUg"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_XI_pEd9LEd62yq234upbUg" name="DiagType7 of MyPackage">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67p-4BFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_XJA3MN9LEd62yq234upbUg" type="Sirius" element="_XI_pEd9LEd62yq234upbUg" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_XJWOYN9LEd62yq234upbUg" type="2002" element="_nKyEZUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_XJWOY99LEd62yq234upbUg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_XJWOZN9LEd62yq234upbUg" type="7001">
+            <children xmi:type="notation:Node" xmi:id="_EvK8oN9MEd62yq234upbUg" type="3008" element="_nK1Hs0ggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_EvLjsN9MEd62yq234upbUg" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_EvMKwN9MEd62yq234upbUg" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_EvMKwd9MEd62yq234upbUg"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_EvMKwt9MEd62yq234upbUg"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_EvOnAN9MEd62yq234upbUg" type="3012" element="_nK2V0EggEeClJJrVvqnbbg">
+                <children xmi:type="notation:Node" xmi:id="_EvOnA99MEd62yq234upbUg" type="5010">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_EvOnBN9MEd62yq234upbUg" y="5"/>
                 </children>
-                <children xmi:type="notation:Node" xmi:id="_EvPOEN9MEd62yq234upbUg" type="3012" element="_nK2V2EggEeClJJrVvqnbbg">
-                  <children xmi:type="notation:Node" xmi:id="_EvPOE99MEd62yq234upbUg" type="5010">
-                    <layoutConstraint xmi:type="notation:Location" xmi:id="_EvPOFN9MEd62yq234upbUg" y="5"/>
-                  </children>
-                  <children xmi:type="notation:Node" xmi:id="_EvTfgN9MEd62yq234upbUg" type="3002" element="_nK284EggEeClJJrVvqnbbg">
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_EvTfgd9MEd62yq234upbUg" fontName="Sans"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EvTfgt9MEd62yq234upbUg"/>
-                  </children>
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_EvPOEd9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LlFwOADEd6J-94GVlGYcA" x="-22" y="32" width="30" height="30"/>
+                <children xmi:type="notation:Node" xmi:id="_EvRqUN9MEd62yq234upbUg" type="3002" element="_nK2V0UggEeClJJrVvqnbbg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_EvRqUd9MEd62yq234upbUg" fontName="Sans"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EvRqUt9MEd62yq234upbUg"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_EvK8od9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LkesOADEd6J-94GVlGYcA" x="75" y="28" width="199" height="137"/>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_EvOnAd9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LkeseADEd6J-94GVlGYcA" x="189" y="32" width="30" height="30"/>
               </children>
-              <children xmi:type="notation:Node" xmi:id="_EvMKw99MEd62yq234upbUg" type="3008" element="_nK1uwEggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_EvMKxt9MEd62yq234upbUg" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_EvMx0N9MEd62yq234upbUg" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_EvMx0d9MEd62yq234upbUg"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_EvMx0t9MEd62yq234upbUg"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_EvWi0N9MEd62yq234upbUg" type="3012" element="_nK2850ggEeClJJrVvqnbbg">
-                  <children xmi:type="notation:Node" xmi:id="_EvWi099MEd62yq234upbUg" type="5010">
-                    <layoutConstraint xmi:type="notation:Location" xmi:id="_EvWi1N9MEd62yq234upbUg" y="5"/>
-                  </children>
-                  <children xmi:type="notation:Node" xmi:id="_EvYYAN9MEd62yq234upbUg" type="3002" element="_nK286EggEeClJJrVvqnbbg">
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_EvYYAd9MEd62yq234upbUg" fontName="Sans"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EvYYAt9MEd62yq234upbUg"/>
-                  </children>
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_EvWi0d9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lls0OADEd6J-94GVlGYcA" x="159" y="60" width="30" height="30"/>
+              <children xmi:type="notation:Node" xmi:id="_EvPOEN9MEd62yq234upbUg" type="3012" element="_nK2V2EggEeClJJrVvqnbbg">
+                <children xmi:type="notation:Node" xmi:id="_EvPOE99MEd62yq234upbUg" type="5010">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_EvPOFN9MEd62yq234upbUg" y="5"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_EvMKxN9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LlFweADEd6J-94GVlGYcA" x="335" y="214" width="199" height="70"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_EvMx099MEd62yq234upbUg" type="3008" element="_nK1uyUggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_EvMx1t9MEd62yq234upbUg" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_EvMx199MEd62yq234upbUg" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_EvMx2N9MEd62yq234upbUg"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_EvMx2d9MEd62yq234upbUg"/>
+                <children xmi:type="notation:Node" xmi:id="_EvTfgN9MEd62yq234upbUg" type="3002" element="_nK284EggEeClJJrVvqnbbg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_EvTfgd9MEd62yq234upbUg" fontName="Sans"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EvTfgt9MEd62yq234upbUg"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_EvMx1N9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lls0eADEd6J-94GVlGYcA" x="584" y="34" width="199" height="70"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_XJWOZd9LEd62yq234upbUg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_XJWOZt9LEd62yq234upbUg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_XJ6PEN9LEd62yq234upbUg" type="3012" element="_nKz5k0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_XJ62IN9LEd62yq234upbUg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XJ62Id9LEd62yq234upbUg" x="142" y="43"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_XJ_uoN9LEd62yq234upbUg" type="3002" element="_nKz5lEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_XJ_uod9LEd62yq234upbUg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XJ_uot9LEd62yq234upbUg"/>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_EvPOEd9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LlFwOADEd6J-94GVlGYcA" x="-22" y="32" width="30" height="30"/>
               </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_XJ6PEd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LjQkuADEd6J-94GVlGYcA" x="120" y="-10" width="61" height="18"/>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_EvK8od9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LkesOADEd6J-94GVlGYcA" x="75" y="28" width="199" height="137"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_XJ62It9LEd62yq234upbUg" type="3012" element="_nK0goUggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_XJ7dMN9LEd62yq234upbUg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XJ7dMd9LEd62yq234upbUg" y="5"/>
+            <children xmi:type="notation:Node" xmi:id="_EvMKw99MEd62yq234upbUg" type="3008" element="_nK1uwEggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_EvMKxt9MEd62yq234upbUg" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_EvMx0N9MEd62yq234upbUg" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_EvMx0d9MEd62yq234upbUg"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_EvMx0t9MEd62yq234upbUg"/>
               </children>
-              <children xmi:type="notation:Node" xmi:id="_XKEnIN9LEd62yq234upbUg" type="3002" element="_nK0gokggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_XKEnId9LEd62yq234upbUg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XKEnIt9LEd62yq234upbUg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_XJ62I99LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lj3oOADEd6J-94GVlGYcA" x="433" y="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_XJ7dMt9LEd62yq234upbUg" type="3012" element="_nK0gqUggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_XJ8EQN9LEd62yq234upbUg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XJ8EQd9LEd62yq234upbUg" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_XKGcUN9LEd62yq234upbUg" type="3002" element="_nK0gqkggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_XKGcUd9LEd62yq234upbUg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XKGcUt9LEd62yq234upbUg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_XJ7dM99LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lj3oeADEd6J-94GVlGYcA" x="-22" y="80" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_XJWOYd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LhbYeADEd6J-94GVlGYcA" x="20" y="20" width="635" height="323"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_XJW1cN9LEd62yq234upbUg" type="2002" element="_nKyreEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_XJW1c99LEd62yq234upbUg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_XJW1dN9LEd62yq234upbUg" type="7001">
-              <children xmi:type="notation:Node" xmi:id="_Ev3gMN9MEd62yq234upbUg" type="3008" element="_nK3j80ggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_Ev4HQN9MEd62yq234upbUg" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_Ev4HQd9MEd62yq234upbUg" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_Ev4HQt9MEd62yq234upbUg"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_Ev4HQ99MEd62yq234upbUg"/>
+              <children xmi:type="notation:Node" xmi:id="_EvWi0N9MEd62yq234upbUg" type="3012" element="_nK2850ggEeClJJrVvqnbbg">
+                <children xmi:type="notation:Node" xmi:id="_EvWi099MEd62yq234upbUg" type="5010">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_EvWi1N9MEd62yq234upbUg" y="5"/>
                 </children>
-                <children xmi:type="notation:Node" xmi:id="_uE0KQO8SEd6XKL8iki2fzg" type="3012" element="_nK4yEEggEeClJJrVvqnbbg">
-                  <children xmi:type="notation:Node" xmi:id="_uE1YYO8SEd6XKL8iki2fzg" type="5010">
-                    <layoutConstraint xmi:type="notation:Location" xmi:id="_uE1YYe8SEd6XKL8iki2fzg" y="5"/>
-                  </children>
-                  <children xmi:type="notation:Node" xmi:id="_uE30oO8SEd6XKL8iki2fzg" type="3002" element="_nK4yEUggEeClJJrVvqnbbg">
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_uE30oe8SEd6XKL8iki2fzg" fontName="Segoe UI"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uE30ou8SEd6XKL8iki2fzg"/>
-                  </children>
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_uE0KQe8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uE0KQu8SEd6XKL8iki2fzg" x="-22" width="30" height="30"/>
+                <children xmi:type="notation:Node" xmi:id="_EvYYAN9MEd62yq234upbUg" type="3002" element="_nK286EggEeClJJrVvqnbbg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_EvYYAd9MEd62yq234upbUg" fontName="Sans"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EvYYAt9MEd62yq234upbUg"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_Ev3gMd9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lm68OADEd6J-94GVlGYcA" x="70" y="78" width="199" height="70"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_Ev4HRN9MEd62yq234upbUg" type="3008" element="_nK4LCEggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_Ev4HR99MEd62yq234upbUg" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_Ev4HSN9MEd62yq234upbUg" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_Ev4uUN9MEd62yq234upbUg"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_Ev4uUd9MEd62yq234upbUg"/>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_EvWi0d9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lls0OADEd6J-94GVlGYcA" x="159" y="60" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_EvMKxN9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LlFweADEd6J-94GVlGYcA" x="335" y="214" width="199" height="70"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_EvMx099MEd62yq234upbUg" type="3008" element="_nK1uyUggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_EvMx1t9MEd62yq234upbUg" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_EvMx199MEd62yq234upbUg" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_EvMx2N9MEd62yq234upbUg"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_EvMx2d9MEd62yq234upbUg"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_EvMx1N9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lls0eADEd6J-94GVlGYcA" x="584" y="34" width="199" height="70"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_XJWOZd9LEd62yq234upbUg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_XJWOZt9LEd62yq234upbUg"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_XJ6PEN9LEd62yq234upbUg" type="3012" element="_nKz5k0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_XJ62IN9LEd62yq234upbUg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_XJ62Id9LEd62yq234upbUg" x="142" y="43"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_XJ_uoN9LEd62yq234upbUg" type="3002" element="_nKz5lEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_XJ_uod9LEd62yq234upbUg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XJ_uot9LEd62yq234upbUg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_XJ6PEd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LjQkuADEd6J-94GVlGYcA" x="120" y="-10" width="61" height="18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_XJ62It9LEd62yq234upbUg" type="3012" element="_nK0goUggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_XJ7dMN9LEd62yq234upbUg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_XJ7dMd9LEd62yq234upbUg" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_XKEnIN9LEd62yq234upbUg" type="3002" element="_nK0gokggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_XKEnId9LEd62yq234upbUg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XKEnIt9LEd62yq234upbUg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_XJ62I99LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lj3oOADEd6J-94GVlGYcA" x="433" y="-22" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_XJ7dMt9LEd62yq234upbUg" type="3012" element="_nK0gqUggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_XJ8EQN9LEd62yq234upbUg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_XJ8EQd9LEd62yq234upbUg" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_XKGcUN9LEd62yq234upbUg" type="3002" element="_nK0gqkggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_XKGcUd9LEd62yq234upbUg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XKGcUt9LEd62yq234upbUg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_XJ7dM99LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lj3oeADEd6J-94GVlGYcA" x="-22" y="80" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_XJWOYd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LhbYeADEd6J-94GVlGYcA" x="20" y="20" width="635" height="323"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_XJW1cN9LEd62yq234upbUg" type="2002" element="_nKyreEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_XJW1c99LEd62yq234upbUg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_XJW1dN9LEd62yq234upbUg" type="7001">
+            <children xmi:type="notation:Node" xmi:id="_Ev3gMN9MEd62yq234upbUg" type="3008" element="_nK3j80ggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_Ev4HQN9MEd62yq234upbUg" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_Ev4HQd9MEd62yq234upbUg" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_Ev4HQt9MEd62yq234upbUg"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_Ev4HQ99MEd62yq234upbUg"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_uE0KQO8SEd6XKL8iki2fzg" type="3012" element="_nK4yEEggEeClJJrVvqnbbg">
+                <children xmi:type="notation:Node" xmi:id="_uE1YYO8SEd6XKL8iki2fzg" type="5010">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_uE1YYe8SEd6XKL8iki2fzg" y="5"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_Ev4HRd9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lm68eADEd6J-94GVlGYcA" x="327" y="78" width="199" height="70"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_XJW1dd9LEd62yq234upbUg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_XJW1dt9LEd62yq234upbUg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_XJW1cd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lls0uADEd6J-94GVlGYcA" x="831" y="30" width="499" height="114"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_XJXcgN9LEd62yq234upbUg" type="2002" element="_nKzSgEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_XJXcg99LEd62yq234upbUg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_XJXchN9LEd62yq234upbUg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_XJXchd9LEd62yq234upbUg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_XJXcht9LEd62yq234upbUg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_XJXcgd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LniAOADEd6J-94GVlGYcA" x="1375" y="30" width="188" height="70"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_XJYDkN9LEd62yq234upbUg" type="2002" element="_nKzSiUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_XJYDk99LEd62yq234upbUg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_XJYDlN9LEd62yq234upbUg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_XJYDld9LEd62yq234upbUg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_XJYDlt9LEd62yq234upbUg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_XJYDkd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LniAeADEd6J-94GVlGYcA" x="1621" y="30" width="188" height="70"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_XJA3Md9LEd62yq234upbUg"/>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKyEZUggEeClJJrVvqnbbg" name="Container without children p1">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nKz5k0ggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nKz5lEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKz5mEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKz5mUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK0goEggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK0goUggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK0gokggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK0gpkggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK0gp0ggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK0gqEggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK0gqUggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK0gqkggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1HsEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1HsUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1HskggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKyrcEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKyrdUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKyrdkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKyrd0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKyrdEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK1Hs0ggEeClJJrVvqnbbg" name="Container without children p1-1">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
-          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK2V0EggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="NSEW">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-            <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK2V0UggEeClJJrVvqnbbg">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK2V1UggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK2V1kggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK2V10ggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-          </ownedBorderedNodes>
-          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK2V2EggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="NSEW">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-            <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK284EggEeClJJrVvqnbbg">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK285EggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK285UggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK285kggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-          </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK1HtEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1HuUggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1HukggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1Hu0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1HuEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK1uwEggEeClJJrVvqnbbg" name="Container without children p1-2">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
-          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK2850ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="NSEW">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-            <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK286EggEeClJJrVvqnbbg">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK3j8EggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK3j8UggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK3j8kggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-          </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK1uwUggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1uxkggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1ux0ggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1uyEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1uxUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK1uyUggEeClJJrVvqnbbg" name="Container without children p1-3">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK1uykggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1uz0ggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1u0EggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1u0UggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK1uzkggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        </ownedDiagramElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKyreEggEeClJJrVvqnbbg" name="Container without children p2">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKyreUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKyrfkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKyrf0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKyrgEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKyrfUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK3j80ggEeClJJrVvqnbbg" name="Container without children p2-1">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
-          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK4yEEggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="NSEW">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-            <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK4yEUggEeClJJrVvqnbbg">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4yFUggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4yFkggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4yF0ggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-          </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK4LAEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4LBUggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4LBkggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4LB0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4LBEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK4LCEggEeClJJrVvqnbbg" name="Container without children p2-2">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK4LCUggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4LDkggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4LD0ggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4LEEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK4LDUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        </ownedDiagramElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKzSgEggEeClJJrVvqnbbg" name="Container without children p3">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKzSgUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKzShkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKzSh0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKzSiEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKzShUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKzSiUggEeClJJrVvqnbbg" name="Container without children p4">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKzSikggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nKz5kEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nKz5kUggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKz5kkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nKzSjkggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+                <children xmi:type="notation:Node" xmi:id="_uE30oO8SEd6XKL8iki2fzg" type="3002" element="_nK4yEUggEeClJJrVvqnbbg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_uE30oe8SEd6XKL8iki2fzg" fontName="Segoe UI"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uE30ou8SEd6XKL8iki2fzg"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_uE0KQe8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uE0KQu8SEd6XKL8iki2fzg" x="-22" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_Ev3gMd9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lm68OADEd6J-94GVlGYcA" x="70" y="78" width="199" height="70"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_Ev4HRN9MEd62yq234upbUg" type="3008" element="_nK4LCEggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_Ev4HR99MEd62yq234upbUg" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_Ev4HSN9MEd62yq234upbUg" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_Ev4uUN9MEd62yq234upbUg"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_Ev4uUd9MEd62yq234upbUg"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_Ev4HRd9MEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lm68eADEd6J-94GVlGYcA" x="327" y="78" width="199" height="70"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_XJW1dd9LEd62yq234upbUg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_XJW1dt9LEd62yq234upbUg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_XJW1cd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Lls0uADEd6J-94GVlGYcA" x="831" y="30" width="499" height="114"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_XJXcgN9LEd62yq234upbUg" type="2002" element="_nKzSgEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_XJXcg99LEd62yq234upbUg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_XJXchN9LEd62yq234upbUg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_XJXchd9LEd62yq234upbUg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_XJXcht9LEd62yq234upbUg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_XJXcgd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LniAOADEd6J-94GVlGYcA" x="1375" y="30" width="188" height="70"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_XJYDkN9LEd62yq234upbUg" type="2002" element="_nKzSiUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_XJYDk99LEd62yq234upbUg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_XJYDlN9LEd62yq234upbUg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_XJYDld9LEd62yq234upbUg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_XJYDlt9LEd62yq234upbUg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_XJYDkd9LEd62yq234upbUg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LniAeADEd6J-94GVlGYcA" x="1621" y="30" width="188" height="70"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_XJA3Md9LEd62yq234upbUg"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd6rDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd67DFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKyEZUggEeClJJrVvqnbbg" name="Container without children p1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nKz5k0ggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nKz5lEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_XJAQIN9LEd62yq234upbUg"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_UJ_2cN9NEd69CIe_kfq8uw" name="DiagType8 of MyPackage">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67rNABFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_UKj3IN9NEd69CIe_kfq8uw" type="Sirius" element="_UJ_2cN9NEd69CIe_kfq8uw" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_UMGIMN9NEd69CIe_kfq8uw" type="2002" element="_nK6AMEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_UMH9YN9NEd69CIe_kfq8uw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_UMIkcN9NEd69CIe_kfq8uw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_UMIkcd9NEd69CIe_kfq8uw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_UMIkct9NEd69CIe_kfq8uw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_UNLGQN9NEd69CIe_kfq8uw" type="3012" element="_nK9qmEggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_UNSbAN9NEd69CIe_kfq8uw" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UNSbAd9NEd69CIe_kfq8uw" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_UNX6kN9NEd69CIe_kfq8uw" type="3002" element="_nK9qmUggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_UNX6kd9NEd69CIe_kfq8uw" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UNX6kt9NEd69CIe_kfq8uw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_UNLGQd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L4jcOWnEd6JMo4lxOczEg" x="120" y="-10" width="61" height="18"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_UNTCEN9NEd69CIe_kfq8uw" type="3012" element="_nK-Ro0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_UNTCE99NEd69CIe_kfq8uw" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UNTCFN9NEd69CIe_kfq8uw" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_UNfPUN9NEd69CIe_kfq8uw" type="3002" element="_nK-RpEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_UNfPUd9NEd69CIe_kfq8uw" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UNfPUt9NEd69CIe_kfq8uw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_UNTCEd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L5KgOWnEd6JMo4lxOczEg" x="432" y="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_UNTpIN9NEd69CIe_kfq8uw" type="3012" element="_nK-Rq0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_UNTpI99NEd69CIe_kfq8uw" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UNTpJN9NEd69CIe_kfq8uw" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_UNlV8N9NEd69CIe_kfq8uw" type="3002" element="_nK-4sEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_UNlV8d9NEd69CIe_kfq8uw" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UNlV8t9NEd69CIe_kfq8uw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_UNTpId9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L5KgeWnEd6JMo4lxOczEg" x="-22" y="81" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_UMGIMd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L38YOWnEd6JMo4lxOczEg" x="200" y="380" width="635" height="323"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_UMIkc99NEd69CIe_kfq8uw" type="2002" element="_nK6AOUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_UMJLgN9NEd69CIe_kfq8uw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_UMJLgd9NEd69CIe_kfq8uw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_UMJLgt9NEd69CIe_kfq8uw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_UMJLg99NEd69CIe_kfq8uw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_UNxjMN9NEd69CIe_kfq8uw" type="3012" element="_nK-4t0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_UNyKQN9NEd69CIe_kfq8uw" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UNyKQd9NEd69CIe_kfq8uw" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_UN5fAN9NEd69CIe_kfq8uw" type="3002" element="_nK-4uEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_UN5fAd9NEd69CIe_kfq8uw" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UN5fAt9NEd69CIe_kfq8uw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_UNxjMd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L5xkOWnEd6JMo4lxOczEg" x="189" y="33" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_UNzYYN9NEd69CIe_kfq8uw" type="3012" element="_nK_fw0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_UNz_cN9NEd69CIe_kfq8uw" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UNz_cd9NEd69CIe_kfq8uw" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_UN--kN9NEd69CIe_kfq8uw" type="3002" element="_nK_fxEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_UN_loN9NEd69CIe_kfq8uw" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UN_lod9NEd69CIe_kfq8uw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_UNzYYd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L5xkeWnEd6JMo4lxOczEg" x="-22" y="33" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_UMIkdN9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L5KguWnEd6JMo4lxOczEg" x="96" y="53" width="199" height="137"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_UMJLhN9NEd69CIe_kfq8uw" type="2002" element="_nK6nSEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_UMJykN9NEd69CIe_kfq8uw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_UMJykd9NEd69CIe_kfq8uw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_UMJykt9NEd69CIe_kfq8uw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_UMJyk99NEd69CIe_kfq8uw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_UOIIgN9NEd69CIe_kfq8uw" type="3012" element="_nK_fy0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_UOIIg99NEd69CIe_kfq8uw" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UOIIhN9NEd69CIe_kfq8uw" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_UOJ9sN9NEd69CIe_kfq8uw" type="3002" element="_nLAG0EggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_UOJ9sd9NEd69CIe_kfq8uw" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UOJ9st9NEd69CIe_kfq8uw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_UOIIgd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L6YoeWnEd6JMo4lxOczEg" x="158" y="60" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_UMJLhd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L6YoOWnEd6JMo4lxOczEg" x="348" y="59" width="199" height="70"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_UMJylN9NEd69CIe_kfq8uw" type="2002" element="_nK7OUEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_UMJyl99NEd69CIe_kfq8uw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_UMKZoN9NEd69CIe_kfq8uw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_UMKZod9NEd69CIe_kfq8uw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_UMKZot9NEd69CIe_kfq8uw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_UMJyld9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L6YouWnEd6JMo4lxOczEg" x="604" y="59" width="199" height="70"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_UMKZo99NEd69CIe_kfq8uw" type="2002" element="_nK7OWUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_UMKZpt9NEd69CIe_kfq8uw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_UMKZp99NEd69CIe_kfq8uw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_UMKZqN9NEd69CIe_kfq8uw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_UMKZqd9NEd69CIe_kfq8uw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_UMKZpN9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L6_sOWnEd6JMo4lxOczEg" x="826" y="29" width="499" height="114"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_UMLnwN9NEd69CIe_kfq8uw" type="2002" element="_nK71YEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_UMLnw99NEd69CIe_kfq8uw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_UMLnxN9NEd69CIe_kfq8uw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_UMLnxd9NEd69CIe_kfq8uw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_UMLnxt9NEd69CIe_kfq8uw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_uQnxoO8SEd6XKL8iki2fzg" type="3012" element="_nLAG10ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_uQnxo-8SEd6XKL8iki2fzg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_uQnxpO8SEd6XKL8iki2fzg" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_uQo_wO8SEd6XKL8iki2fzg" type="3002" element="_nLAt4EggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_uQo_we8SEd6XKL8iki2fzg" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uQo_wu8SEd6XKL8iki2fzg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_uQnxoe8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uQnxou8SEd6XKL8iki2fzg" x="-22" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_UMLnwd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L6_seWnEd6JMo4lxOczEg" x="901" y="113" width="199" height="70"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_UMMO0N9NEd69CIe_kfq8uw" type="2002" element="_nK8ceEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_UMMO099NEd69CIe_kfq8uw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_UMMO1N9NEd69CIe_kfq8uw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_UMMO1d9NEd69CIe_kfq8uw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_UMMO1t9NEd69CIe_kfq8uw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_UMMO0d9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L7mwOWnEd6JMo4lxOczEg" x="1158" y="113" width="199" height="70"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_UMM14N9NEd69CIe_kfq8uw" type="2002" element="_nK9DgkggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_UMM1499NEd69CIe_kfq8uw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_UMM15N9NEd69CIe_kfq8uw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_UMM15d9NEd69CIe_kfq8uw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_UMM15t9NEd69CIe_kfq8uw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_UMM14d9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L7mweWnEd6JMo4lxOczEg" x="1370" y="29" width="188" height="70"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_UMM1599NEd69CIe_kfq8uw" type="2002" element="_nK9Di0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_UMNc8N9NEd69CIe_kfq8uw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_UMNc8d9NEd69CIe_kfq8uw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_UMNc8t9NEd69CIe_kfq8uw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_UMNc899NEd69CIe_kfq8uw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_UMM16N9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L8N0OWnEd6JMo4lxOczEg" x="1616" y="29" width="188" height="70"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_UKj3Id9NEd69CIe_kfq8uw"/>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK6AMEggEeClJJrVvqnbbg" name="Container without children p1">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK9qmEggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="EAST_WEST">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK9qmUggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK-RoEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK-RoUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK-RokggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK-Ro0ggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="EAST_WEST">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK-RpEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK-RqEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK-RqUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK-RqkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK-Rq0ggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="EAST_WEST">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK-4sEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK-4tEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK-4tUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK-4tkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK6AMUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6ANkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6AN0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6AOEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6ANUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK0goUggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK0gokggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK6AOUggEeClJJrVvqnbbg" name="Container without children p1-1">
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK0gqUggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK0gqkggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKyrcEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK1Hs0ggEeClJJrVvqnbbg" name="Container without children p1-1">
         <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
         <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK-4t0ggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="EAST_WEST">
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK2V0EggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="NSEW">
           <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
           <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK-4uEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK_fwEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK_fwUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK_fwkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK2V0UggEeClJJrVvqnbbg">
+            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
         </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK_fw0ggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="EAST_WEST">
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK2V2EggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="NSEW">
           <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
           <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK_fxEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK_fyEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK_fyUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK_fykggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK284EggEeClJJrVvqnbbg">
+            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK6nQEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6nRUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6nRkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6nR0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6nREggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK1HtEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK6nSEggEeClJJrVvqnbbg" name="Container without children p1-2">
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK1uwEggEeClJJrVvqnbbg" name="Container without children p1-2">
         <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
         <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK_fy0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="EAST_WEST">
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK2850ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="NSEW">
           <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
           <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLAG0EggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLAG1EggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLAG1UggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLAG1kggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK286EggEeClJJrVvqnbbg">
+            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK6nSUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6nTkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6nT0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6nUEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK6nTUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK1uwUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK7OUEggEeClJJrVvqnbbg" name="Container without children p1-3">
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK1uyUggEeClJJrVvqnbbg" name="Container without children p1-3">
         <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
         <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK7OUUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK7OVkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK7OV0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK7OWEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK7OVUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK7OWUggEeClJJrVvqnbbg" name="Container without children p2">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK7OWkggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK7OX0ggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK7OYEggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK7OYUggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK7OXkggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK1uykggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK71YEggEeClJJrVvqnbbg" name="Container without children p2-1">
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKyreEggEeClJJrVvqnbbg" name="Container without children p2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKyreUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK3j80ggEeClJJrVvqnbbg" name="Container without children p2-1">
         <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
         <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLAG10ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="EAST_WEST">
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK4yEEggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="NSEW">
           <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
           <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLAt4EggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLAt5EggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLAt5UggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLAt5kggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK4yEUggEeClJJrVvqnbbg">
+            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK8ccEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK8cdUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK8cdkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK8cd0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK8cdEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK4LAEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK8ceEggEeClJJrVvqnbbg" name="Container without children p2-2">
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK4LCEggEeClJJrVvqnbbg" name="Container without children p2-2">
         <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
         <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK8ceUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK8cfkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK9DgEggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK9DgUggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK8cfUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK4LCUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK9DgkggEeClJJrVvqnbbg" name="Container without children p3">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK9Dg0ggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK9DiEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK9DiUggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK9DikggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK9Dh0ggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKzSgEggEeClJJrVvqnbbg" name="Container without children p3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKzSgUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nKzSiUggEeClJJrVvqnbbg" name="Container without children p4">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nKzSikggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_XJAQIN9LEd62yq234upbUg"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_UJ_2cN9NEd69CIe_kfq8uw" name="DiagType8 of MyPackage">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67rNABFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_UKj3IN9NEd69CIe_kfq8uw" type="Sirius" element="_UJ_2cN9NEd69CIe_kfq8uw" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_UMGIMN9NEd69CIe_kfq8uw" type="2002" element="_nK6AMEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_UMH9YN9NEd69CIe_kfq8uw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_UMIkcN9NEd69CIe_kfq8uw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_UMIkcd9NEd69CIe_kfq8uw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_UMIkct9NEd69CIe_kfq8uw"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UNLGQN9NEd69CIe_kfq8uw" type="3012" element="_nK9qmEggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_UNSbAN9NEd69CIe_kfq8uw" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UNSbAd9NEd69CIe_kfq8uw" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UNX6kN9NEd69CIe_kfq8uw" type="3002" element="_nK9qmUggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UNX6kd9NEd69CIe_kfq8uw" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UNX6kt9NEd69CIe_kfq8uw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UNLGQd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L4jcOWnEd6JMo4lxOczEg" x="120" y="-10" width="61" height="18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UNTCEN9NEd69CIe_kfq8uw" type="3012" element="_nK-Ro0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_UNTCE99NEd69CIe_kfq8uw" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UNTCFN9NEd69CIe_kfq8uw" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UNfPUN9NEd69CIe_kfq8uw" type="3002" element="_nK-RpEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UNfPUd9NEd69CIe_kfq8uw" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UNfPUt9NEd69CIe_kfq8uw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UNTCEd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L5KgOWnEd6JMo4lxOczEg" x="432" y="-22" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UNTpIN9NEd69CIe_kfq8uw" type="3012" element="_nK-Rq0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_UNTpI99NEd69CIe_kfq8uw" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UNTpJN9NEd69CIe_kfq8uw" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UNlV8N9NEd69CIe_kfq8uw" type="3002" element="_nK-4sEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UNlV8d9NEd69CIe_kfq8uw" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UNlV8t9NEd69CIe_kfq8uw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UNTpId9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L5KgeWnEd6JMo4lxOczEg" x="-22" y="81" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_UMGIMd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L38YOWnEd6JMo4lxOczEg" x="200" y="380" width="635" height="323"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_UMIkc99NEd69CIe_kfq8uw" type="2002" element="_nK6AOUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_UMJLgN9NEd69CIe_kfq8uw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_UMJLgd9NEd69CIe_kfq8uw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_UMJLgt9NEd69CIe_kfq8uw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_UMJLg99NEd69CIe_kfq8uw"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UNxjMN9NEd69CIe_kfq8uw" type="3012" element="_nK-4t0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_UNyKQN9NEd69CIe_kfq8uw" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UNyKQd9NEd69CIe_kfq8uw" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UN5fAN9NEd69CIe_kfq8uw" type="3002" element="_nK-4uEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UN5fAd9NEd69CIe_kfq8uw" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UN5fAt9NEd69CIe_kfq8uw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UNxjMd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L5xkOWnEd6JMo4lxOczEg" x="189" y="33" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UNzYYN9NEd69CIe_kfq8uw" type="3012" element="_nK_fw0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_UNz_cN9NEd69CIe_kfq8uw" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UNz_cd9NEd69CIe_kfq8uw" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UN--kN9NEd69CIe_kfq8uw" type="3002" element="_nK_fxEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UN_loN9NEd69CIe_kfq8uw" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UN_lod9NEd69CIe_kfq8uw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UNzYYd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L5xkeWnEd6JMo4lxOczEg" x="-22" y="33" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_UMIkdN9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L5KguWnEd6JMo4lxOczEg" x="96" y="53" width="199" height="137"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_UMJLhN9NEd69CIe_kfq8uw" type="2002" element="_nK6nSEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_UMJykN9NEd69CIe_kfq8uw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_UMJykd9NEd69CIe_kfq8uw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_UMJykt9NEd69CIe_kfq8uw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_UMJyk99NEd69CIe_kfq8uw"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UOIIgN9NEd69CIe_kfq8uw" type="3012" element="_nK_fy0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_UOIIg99NEd69CIe_kfq8uw" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UOIIhN9NEd69CIe_kfq8uw" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_UOJ9sN9NEd69CIe_kfq8uw" type="3002" element="_nLAG0EggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_UOJ9sd9NEd69CIe_kfq8uw" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UOJ9st9NEd69CIe_kfq8uw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_UOIIgd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L6YoeWnEd6JMo4lxOczEg" x="158" y="60" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_UMJLhd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L6YoOWnEd6JMo4lxOczEg" x="348" y="59" width="199" height="70"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_UMJylN9NEd69CIe_kfq8uw" type="2002" element="_nK7OUEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_UMJyl99NEd69CIe_kfq8uw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_UMKZoN9NEd69CIe_kfq8uw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_UMKZod9NEd69CIe_kfq8uw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_UMKZot9NEd69CIe_kfq8uw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_UMJyld9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L6YouWnEd6JMo4lxOczEg" x="604" y="59" width="199" height="70"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_UMKZo99NEd69CIe_kfq8uw" type="2002" element="_nK7OWUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_UMKZpt9NEd69CIe_kfq8uw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_UMKZp99NEd69CIe_kfq8uw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_UMKZqN9NEd69CIe_kfq8uw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_UMKZqd9NEd69CIe_kfq8uw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_UMKZpN9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L6_sOWnEd6JMo4lxOczEg" x="826" y="29" width="499" height="114"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_UMLnwN9NEd69CIe_kfq8uw" type="2002" element="_nK71YEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_UMLnw99NEd69CIe_kfq8uw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_UMLnxN9NEd69CIe_kfq8uw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_UMLnxd9NEd69CIe_kfq8uw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_UMLnxt9NEd69CIe_kfq8uw"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_uQnxoO8SEd6XKL8iki2fzg" type="3012" element="_nLAG10ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_uQnxo-8SEd6XKL8iki2fzg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_uQnxpO8SEd6XKL8iki2fzg" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_uQo_wO8SEd6XKL8iki2fzg" type="3002" element="_nLAt4EggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_uQo_we8SEd6XKL8iki2fzg" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uQo_wu8SEd6XKL8iki2fzg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_uQnxoe8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uQnxou8SEd6XKL8iki2fzg" x="-22" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_UMLnwd9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L6_seWnEd6JMo4lxOczEg" x="901" y="113" width="199" height="70"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_UMMO0N9NEd69CIe_kfq8uw" type="2002" element="_nK8ceEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_UMMO099NEd69CIe_kfq8uw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_UMMO1N9NEd69CIe_kfq8uw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_UMMO1d9NEd69CIe_kfq8uw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_UMMO1t9NEd69CIe_kfq8uw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_UMMO0d9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L7mwOWnEd6JMo4lxOczEg" x="1158" y="113" width="199" height="70"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_UMM14N9NEd69CIe_kfq8uw" type="2002" element="_nK9DgkggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_UMM1499NEd69CIe_kfq8uw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_UMM15N9NEd69CIe_kfq8uw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_UMM15d9NEd69CIe_kfq8uw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_UMM15t9NEd69CIe_kfq8uw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_UMM14d9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L7mweWnEd6JMo4lxOczEg" x="1370" y="29" width="188" height="70"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_UMM1599NEd69CIe_kfq8uw" type="2002" element="_nK9Di0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_UMNc8N9NEd69CIe_kfq8uw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_UMNc8d9NEd69CIe_kfq8uw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_UMNc8t9NEd69CIe_kfq8uw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_UMNc899NEd69CIe_kfq8uw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_UMM16N9NEd69CIe_kfq8uw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4L8N0OWnEd6JMo4lxOczEg" x="1616" y="29" width="188" height="70"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_UKj3Id9NEd69CIe_kfq8uw"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd7LDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd7bDFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK6AMEggEeClJJrVvqnbbg" name="Container without children p1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK9qmEggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK9qmUggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK9Di0ggEeClJJrVvqnbbg" name="Container without children p4">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK9qkEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nK9qlUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nK9qlkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK9ql0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nK9qlEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK-Ro0ggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK-RpEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_UJ_2cd9NEd69CIe_kfq8uw"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_BXkP4OWoEd6JMo4lxOczEg" name="DiagType9 of MyPackage">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67r0EBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_BX_tsOWoEd6JMo4lxOczEg" type="Sirius" element="_BXkP4OWoEd6JMo4lxOczEg" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_BYNwIOWoEd6JMo4lxOczEg" type="2002" element="_nLBU8EggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_BYNwI-WoEd6JMo4lxOczEg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_BYOXMOWoEd6JMo4lxOczEg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_BYOXMeWoEd6JMo4lxOczEg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_BYOXMuWoEd6JMo4lxOczEg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_BYtfYOWoEd6JMo4lxOczEg" type="3012" element="_nLDKIEggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_BY1bMOWoEd6JMo4lxOczEg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_BY1bMeWoEd6JMo4lxOczEg" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_BaC8IOWoEd6JMo4lxOczEg" type="3002" element="_nLDKIUggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_BaC8IeWoEd6JMo4lxOczEg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaC8IuWoEd6JMo4lxOczEg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_BYtfYeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdU-8OWoEd6JMo4lxOczEg" x="120" y="-10" width="61" height="18"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_BY2CQOWoEd6JMo4lxOczEg" type="3012" element="_nLDKKEggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_BY2pUOWoEd6JMo4lxOczEg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_BY2pUeWoEd6JMo4lxOczEg" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_BaExUOWoEd6JMo4lxOczEg" type="3002" element="_nLDxMEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_BaExUeWoEd6JMo4lxOczEg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaExUuWoEd6JMo4lxOczEg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_BY2CQeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdU-8eWoEd6JMo4lxOczEg" x="432" y="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_BY3QYOWoEd6JMo4lxOczEg" type="3012" element="_nLDxN0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_BY33cOWoEd6JMo4lxOczEg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_BY33ceWoEd6JMo4lxOczEg" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_BaF_cOWoEd6JMo4lxOczEg" type="3002" element="_nLDxOEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_BaF_ceWoEd6JMo4lxOczEg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaF_cuWoEd6JMo4lxOczEg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_BY3QYeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdU-8uWoEd6JMo4lxOczEg" x="-22" y="80" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_BY5FkOWoEd6JMo4lxOczEg" type="3012" element="_nLDxP0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_BY5soOWoEd6JMo4lxOczEg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_BY5soeWoEd6JMo4lxOczEg" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_BaHNkOWoEd6JMo4lxOczEg" type="3002" element="_nLEYQEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_BaHNkeWoEd6JMo4lxOczEg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaHNkuWoEd6JMo4lxOczEg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_BY5FkeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdVmAOWoEd6JMo4lxOczEg" x="268" y="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_BY66wOWoEd6JMo4lxOczEg" type="3012" element="_nLEYR0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_BY7h0OWoEd6JMo4lxOczEg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_BY7h0eWoEd6JMo4lxOczEg" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_BaJCwOWoEd6JMo4lxOczEg" type="3002" element="_nLEYSEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_BaJCweWoEd6JMo4lxOczEg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaJCwuWoEd6JMo4lxOczEg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_BY66weWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdVmAeWoEd6JMo4lxOczEg" x="-22" y="111" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_BY8I4OWoEd6JMo4lxOczEg" type="3012" element="_nLE_UUggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_BY9XAOWoEd6JMo4lxOczEg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_BY9XAeWoEd6JMo4lxOczEg" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_BaKQ4OWoEd6JMo4lxOczEg" type="3002" element="_nLE_UkggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_BaKQ4eWoEd6JMo4lxOczEg" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaKQ4uWoEd6JMo4lxOczEg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_BY8I4eWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdWNEOWoEd6JMo4lxOczEg" x="498" y="313" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_BYNwIeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdUX4OWoEd6JMo4lxOczEg" x="24" y="20" width="635" height="323"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_BYOXM-WoEd6JMo4lxOczEg" type="2002" element="_nLB8AEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_BYOXNuWoEd6JMo4lxOczEg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_BYO-QOWoEd6JMo4lxOczEg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_BYO-QeWoEd6JMo4lxOczEg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_BYO-QuWoEd6JMo4lxOczEg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_uxRnoO8SEd6XKL8iki2fzg" type="3012" element="_nLE_WUggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_uxSOsO8SEd6XKL8iki2fzg" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_uxSOse8SEd6XKL8iki2fzg" x="31" y="15"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_uxTc0O8SEd6XKL8iki2fzg" type="3002" element="_nLFmYEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_uxTc0e8SEd6XKL8iki2fzg" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uxTc0u8SEd6XKL8iki2fzg"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_uxRnoe8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uxRnou8SEd6XKL8iki2fzg" x="-22" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_BYOXNOWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdWNEeWoEd6JMo4lxOczEg" x="834" y="29" width="499" height="114"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_BYO-Q-WoEd6JMo4lxOczEg" type="2002" element="_nLB8CUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_BYO-RuWoEd6JMo4lxOczEg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_BYO-R-WoEd6JMo4lxOczEg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_BYO-SOWoEd6JMo4lxOczEg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_BYO-SeWoEd6JMo4lxOczEg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_BYO-ROWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdWNEuWoEd6JMo4lxOczEg" x="1378" y="29" width="220" height="84"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_BYPlUOWoEd6JMo4lxOczEg" type="2002" element="_nLCjE0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_BYPlU-WoEd6JMo4lxOczEg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_BYPlVOWoEd6JMo4lxOczEg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_BYPlVeWoEd6JMo4lxOczEg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_BYPlVuWoEd6JMo4lxOczEg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_BYPlUeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdW0IOWoEd6JMo4lxOczEg" x="1624" y="29" width="227" height="84"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_BX_tseWoEd6JMo4lxOczEg"/>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLBU8EggEeClJJrVvqnbbg" name="Container without children p1">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLDKIEggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLDKIUggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLDKJUggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLDKJkggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLDKJ0ggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLDKKEggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLDxMEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLDxNEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLDxNUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLDxNkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLDxN0ggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLDxOEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLDxPEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLDxPUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLDxPkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLDxP0ggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLEYQEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLEYREggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLEYRUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLEYRkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLEYR0ggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLEYSEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLEYTEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLEYTUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLE_UEggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLE_UUggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLE_UkggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLE_VkggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLE_V0ggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLE_WEggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLBU8UggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLBU9kggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLBU90ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLBU-EggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLBU9UggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK-Rq0ggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK-4sEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK6AMUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK6AOUggEeClJJrVvqnbbg" name="Container without children p1-1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK-4t0ggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK-4uEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLB8AEggEeClJJrVvqnbbg" name="Container without children p2">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLE_WUggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLFmYEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLGNcEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLGNcUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLGNckggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLB8AUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLB8BkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLB8B0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLB8CEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLB8BUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK_fw0ggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nK_fxEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK6nQEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK6nSEggEeClJJrVvqnbbg" name="Container without children p1-2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nK_fy0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLAG0EggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK6nSUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK7OUEggEeClJJrVvqnbbg" name="Container without children p1-3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK7OUUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK7OWUggEeClJJrVvqnbbg" name="Container without children p2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK7OWkggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK71YEggEeClJJrVvqnbbg" name="Container without children p2-1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLAG10ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLAt4EggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK8ccEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK8ceEggEeClJJrVvqnbbg" name="Container without children p2-2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK8ceUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK9DgkggEeClJJrVvqnbbg" name="Container without children p3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK9Dg0ggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nK9Di0ggEeClJJrVvqnbbg" name="Container without children p4">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nK9qkEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_UJ_2cd9NEd69CIe_kfq8uw"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_BXkP4OWoEd6JMo4lxOczEg" name="DiagType9 of MyPackage">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67r0EBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_BX_tsOWoEd6JMo4lxOczEg" type="Sirius" element="_BXkP4OWoEd6JMo4lxOczEg" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_BYNwIOWoEd6JMo4lxOczEg" type="2002" element="_nLBU8EggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_BYNwI-WoEd6JMo4lxOczEg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_BYOXMOWoEd6JMo4lxOczEg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_BYOXMeWoEd6JMo4lxOczEg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_BYOXMuWoEd6JMo4lxOczEg"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_BYtfYOWoEd6JMo4lxOczEg" type="3012" element="_nLDKIEggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_BY1bMOWoEd6JMo4lxOczEg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_BY1bMeWoEd6JMo4lxOczEg" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_BaC8IOWoEd6JMo4lxOczEg" type="3002" element="_nLDKIUggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_BaC8IeWoEd6JMo4lxOczEg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaC8IuWoEd6JMo4lxOczEg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_BYtfYeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdU-8OWoEd6JMo4lxOczEg" x="120" y="-10" width="61" height="18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_BY2CQOWoEd6JMo4lxOczEg" type="3012" element="_nLDKKEggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_BY2pUOWoEd6JMo4lxOczEg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_BY2pUeWoEd6JMo4lxOczEg" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_BaExUOWoEd6JMo4lxOczEg" type="3002" element="_nLDxMEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_BaExUeWoEd6JMo4lxOczEg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaExUuWoEd6JMo4lxOczEg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_BY2CQeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdU-8eWoEd6JMo4lxOczEg" x="432" y="-22" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_BY3QYOWoEd6JMo4lxOczEg" type="3012" element="_nLDxN0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_BY33cOWoEd6JMo4lxOczEg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_BY33ceWoEd6JMo4lxOczEg" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_BaF_cOWoEd6JMo4lxOczEg" type="3002" element="_nLDxOEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_BaF_ceWoEd6JMo4lxOczEg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaF_cuWoEd6JMo4lxOczEg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_BY3QYeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdU-8uWoEd6JMo4lxOczEg" x="-22" y="80" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_BY5FkOWoEd6JMo4lxOczEg" type="3012" element="_nLDxP0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_BY5soOWoEd6JMo4lxOczEg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_BY5soeWoEd6JMo4lxOczEg" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_BaHNkOWoEd6JMo4lxOczEg" type="3002" element="_nLEYQEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_BaHNkeWoEd6JMo4lxOczEg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaHNkuWoEd6JMo4lxOczEg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_BY5FkeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdVmAOWoEd6JMo4lxOczEg" x="268" y="-22" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_BY66wOWoEd6JMo4lxOczEg" type="3012" element="_nLEYR0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_BY7h0OWoEd6JMo4lxOczEg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_BY7h0eWoEd6JMo4lxOczEg" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_BaJCwOWoEd6JMo4lxOczEg" type="3002" element="_nLEYSEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_BaJCweWoEd6JMo4lxOczEg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaJCwuWoEd6JMo4lxOczEg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_BY66weWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdVmAeWoEd6JMo4lxOczEg" x="-22" y="111" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_BY8I4OWoEd6JMo4lxOczEg" type="3012" element="_nLE_UUggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_BY9XAOWoEd6JMo4lxOczEg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_BY9XAeWoEd6JMo4lxOczEg" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_BaKQ4OWoEd6JMo4lxOczEg" type="3002" element="_nLE_UkggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_BaKQ4eWoEd6JMo4lxOczEg" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaKQ4uWoEd6JMo4lxOczEg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_BY8I4eWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdWNEOWoEd6JMo4lxOczEg" x="498" y="313" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_BYNwIeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdUX4OWoEd6JMo4lxOczEg" x="24" y="20" width="635" height="323"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_BYOXM-WoEd6JMo4lxOczEg" type="2002" element="_nLB8AEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_BYOXNuWoEd6JMo4lxOczEg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_BYO-QOWoEd6JMo4lxOczEg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_BYO-QeWoEd6JMo4lxOczEg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_BYO-QuWoEd6JMo4lxOczEg"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_uxRnoO8SEd6XKL8iki2fzg" type="3012" element="_nLE_WUggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_uxSOsO8SEd6XKL8iki2fzg" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_uxSOse8SEd6XKL8iki2fzg" x="31" y="15"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_uxTc0O8SEd6XKL8iki2fzg" type="3002" element="_nLFmYEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_uxTc0e8SEd6XKL8iki2fzg" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uxTc0u8SEd6XKL8iki2fzg"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_uxRnoe8SEd6XKL8iki2fzg" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uxRnou8SEd6XKL8iki2fzg" x="-22" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_BYOXNOWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdWNEeWoEd6JMo4lxOczEg" x="834" y="29" width="499" height="114"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_BYO-Q-WoEd6JMo4lxOczEg" type="2002" element="_nLB8CUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_BYO-RuWoEd6JMo4lxOczEg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_BYO-R-WoEd6JMo4lxOczEg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_BYO-SOWoEd6JMo4lxOczEg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_BYO-SeWoEd6JMo4lxOczEg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_BYO-ROWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdWNEuWoEd6JMo4lxOczEg" x="1378" y="29" width="220" height="84"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_BYPlUOWoEd6JMo4lxOczEg" type="2002" element="_nLCjE0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_BYPlU-WoEd6JMo4lxOczEg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_BYPlVOWoEd6JMo4lxOczEg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_BYPlVeWoEd6JMo4lxOczEg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_BYPlVuWoEd6JMo4lxOczEg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_BYPlUeWoEd6JMo4lxOczEg" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LdW0IOWoEd6JMo4lxOczEg" x="1624" y="29" width="227" height="84"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_BX_tseWoEd6JMo4lxOczEg"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd7rDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd77DFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLBU8EggEeClJJrVvqnbbg" name="Container without children p1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLDKIEggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLDKIUggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLB8CUggEeClJJrVvqnbbg" name="Container without children p3">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLB8CkggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLCjEEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLCjEUggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLCjEkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLB8DkggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLDKKEggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLDxMEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLCjE0ggEeClJJrVvqnbbg" name="Container without children p4">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLCjFEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLCjGUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLCjGkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLCjG0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLCjGEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLDxN0ggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLDxOEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_BXkP4eWoEd6JMo4lxOczEg"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_E26kAOi7Ed6VHqj_dPYIrw" name="DiagType8 of p2">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67sbIBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_E3Cf0Oi7Ed6VHqj_dPYIrw" type="Sirius" element="_E26kAOi7Ed6VHqj_dPYIrw" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_E3H_YOi7Ed6VHqj_dPYIrw" type="2002" element="_nLG0gEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_E3JNgOi7Ed6VHqj_dPYIrw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_E3JNgei7Ed6VHqj_dPYIrw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_E3JNgui7Ed6VHqj_dPYIrw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_E3JNg-i7Ed6VHqj_dPYIrw"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_E3i2IOi7Ed6VHqj_dPYIrw" type="3012" element="_nLHbmEggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_E3jdMOi7Ed6VHqj_dPYIrw" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_E3jdMei7Ed6VHqj_dPYIrw" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_E3w4kOi7Ed6VHqj_dPYIrw" type="3002" element="_nLHbmUggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_E3w4kei7Ed6VHqj_dPYIrw" fontName="Sans"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E3w4kui7Ed6VHqj_dPYIrw"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_E3i2Iei7Ed6VHqj_dPYIrw" fontName="Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E3i2Iui7Ed6VHqj_dPYIrw" x="-22" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_E3H_Yei7Ed6VHqj_dPYIrw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E3H_Yui7Ed6VHqj_dPYIrw" x="200" y="100" width="309" height="79"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_E3J0kOi7Ed6VHqj_dPYIrw" type="2002" element="_nLG0iUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_E3J0k-i7Ed6VHqj_dPYIrw" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_E3KboOi7Ed6VHqj_dPYIrw" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_E3Kboei7Ed6VHqj_dPYIrw"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_E3Kboui7Ed6VHqj_dPYIrw"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_E3J0kei7Ed6VHqj_dPYIrw" fontName="Sans" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E3J0kui7Ed6VHqj_dPYIrw" x="200" y="200" width="309" height="78"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_E3Cf0ei7Ed6VHqj_dPYIrw"/>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLG0gEggEeClJJrVvqnbbg" name="Container without children p2-1">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLHbmEggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="EAST_WEST">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLHbmUggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLICoEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLICoUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLICokggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLG0gUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLG0hkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLG0h0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLG0iEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLG0hUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLDxP0ggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLEYQEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLG0iUggEeClJJrVvqnbbg" name="Container without children p2-2">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLHbkEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLHblUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLHblkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLHbl0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLHblEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLEYR0ggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLEYSEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_E26kAei7Ed6VHqj_dPYIrw"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLE_UUggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLE_UkggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLBU8UggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLB8AEggEeClJJrVvqnbbg" name="Container without children p2">
       <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_JnbuIPlNEd6Y1bDJsdKxyg" name="Type1 Raw Diagram">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67tCMBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_Jo9_MPlNEd6Y1bDJsdKxyg" type="Sirius" element="_JnbuIPlNEd6Y1bDJsdKxyg" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_JqmW4PlNEd6Y1bDJsdKxyg" type="2002" element="_nLIpsEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_Jq544PlNEd6Y1bDJsdKxyg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_Jq__gPlNEd6Y1bDJsdKxyg" type="7001">
-              <children xmi:type="notation:Node" xmi:id="_JrJJcPlNEd6Y1bDJsdKxyg" type="3007" element="_nLJ32EggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_JrV9wPlNEd6Y1bDJsdKxyg" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_JrV9wflNEd6Y1bDJsdKxyg" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_JriyEPlNEd6Y1bDJsdKxyg" type="3004" element="_nLKe4EggEeClJJrVvqnbbg">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_JriyEflNEd6Y1bDJsdKxyg" fontName="Segoe UI"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JriyEvlNEd6Y1bDJsdKxyg"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_JrJJcflNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LvZnUPxaEd6fe5GJbtZ0sw" x="105" y="124" width="61" height="18"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_JrWk0PlNEd6Y1bDJsdKxyg" type="3007" element="_nLKe50ggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_JrWk0_lNEd6Y1bDJsdKxyg" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_JrWk1PlNEd6Y1bDJsdKxyg" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_JrjZIPlNEd6Y1bDJsdKxyg" type="3004" element="_nLKe6EggEeClJJrVvqnbbg">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_JrjZIflNEd6Y1bDJsdKxyg" fontName="Segoe UI"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrjZIvlNEd6Y1bDJsdKxyg"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_JrWk0flNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lva1cPxaEd6fe5GJbtZ0sw" x="165" y="39" width="30" height="30"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_JrXL4PlNEd6Y1bDJsdKxyg" type="3007" element="_nLLF8UggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_JrXL4_lNEd6Y1bDJsdKxyg" type="5003">
-                  <layoutConstraint xmi:type="notation:Location" xmi:id="_JrXL5PlNEd6Y1bDJsdKxyg" y="5"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_JrkAMPlNEd6Y1bDJsdKxyg" type="3004" element="_nLLF8kggEeClJJrVvqnbbg">
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_JrkAMflNEd6Y1bDJsdKxyg" fontName="Segoe UI"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrkAMvlNEd6Y1bDJsdKxyg"/>
-                </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_JrXL4flNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lva1cfxaEd6fe5GJbtZ0sw" x="25" y="34" width="30" height="30"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_Jq__gflNEd6Y1bDJsdKxyg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_Jq__gvlNEd6Y1bDJsdKxyg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_JqmW4flNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JqmW4vlNEd6Y1bDJsdKxyg" x="425" y="55" width="311" height="234"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Jq__g_lNEd6Y1bDJsdKxyg" type="2002" element="_nLIpuUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_JrAmkflNEd6Y1bDJsdKxyg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_JrAmkvlNEd6Y1bDJsdKxyg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_JrAmk_lNEd6Y1bDJsdKxyg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_JrAmlPlNEd6Y1bDJsdKxyg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_Jq__hPlNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrAmkPlNEd6Y1bDJsdKxyg" x="40" y="35" width="157" height="80"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_JrAmlflNEd6Y1bDJsdKxyg" type="2002" element="_nLJQw0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_JrBNoPlNEd6Y1bDJsdKxyg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_JrBNoflNEd6Y1bDJsdKxyg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_JrBNovlNEd6Y1bDJsdKxyg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_JrBNo_lNEd6Y1bDJsdKxyg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_JrAmlvlNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrAml_lNEd6Y1bDJsdKxyg" x="165" y="130" width="157" height="91"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_JrBNpPlNEd6Y1bDJsdKxyg" type="2002" element="_nLJQzEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_JrBNp_lNEd6Y1bDJsdKxyg" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_JrB0sPlNEd6Y1bDJsdKxyg" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_JrB0sflNEd6Y1bDJsdKxyg"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_JrB0svlNEd6Y1bDJsdKxyg"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_JrBNpflNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrBNpvlNEd6Y1bDJsdKxyg" x="35" y="230" width="168" height="80"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_Jo9_MflNEd6Y1bDJsdKxyg"/>
-          <edges xmi:type="notation:Edge" xmi:id="_JsBTMPlNEd6Y1bDJsdKxyg" type="4001" element="_nLMUEEggEeClJJrVvqnbbg" source="_JrJJcPlNEd6Y1bDJsdKxyg" target="_JrWk0PlNEd6Y1bDJsdKxyg">
-            <children xmi:type="notation:Node" xmi:id="_JsM5YPlNEd6Y1bDJsdKxyg" type="6001">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zNmNMoRLEeOg_8QSiaL3XA" x="10" y="27"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oA4BdpkKEeCez7uszjfVoA" type="6002">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oA4Bd5kKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_oA4BeJkKEeCez7uszjfVoA" type="6003">
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oA4BeZkKEeCez7uszjfVoA" y="10"/>
-            </children>
-            <styles xmi:type="notation:ConnectorStyle" xmi:id="_JsBTMflNEd6Y1bDJsdKxyg"/>
-            <styles xmi:type="notation:FontStyle" xmi:id="_JsBTMvlNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
-            <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LvZnUfxaEd6fe5GJbtZ0sw" points="[27, 8, -274, 0]$[288, 8, -13, 0]"/>
-            <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y3DqMfxYEd6fe5GJbtZ0sw" id="(0.41666666,0.057142857)"/>
-            <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y3DqMvxYEd6fe5GJbtZ0sw" id="(0.57894737,0.94285715)"/>
-          </edges>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLIpsEggEeClJJrVvqnbbg" name="Container p1">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-        <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-        <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLIpsUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLIptkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLIpt0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLIpuEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLIptUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nLJ32EggEeClJJrVvqnbbg" name="C1-1" outgoingEdges="_nLMUEEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nLKe4EggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLKe5EggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLKe5UggEeClJJrVvqnbbg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_JWB-MDV2EeKMTft4yhZhAw"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nLKe50ggEeClJJrVvqnbbg" name="C1-2" incomingEdges="_nLMUEEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nLKe6EggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLKe7EggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLKe7UggEeClJJrVvqnbbg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_JWClQDV2EeKMTft4yhZhAw"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nLLF8UggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-          <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-          <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-          <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nLLF8kggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLLF9kggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLLF90ggEeClJJrVvqnbbg"/>
-            <color xmi:type="viewpoint:RGBValues" xmi:id="_JWClQTV2EeKMTft4yhZhAw"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
-        </ownedDiagramElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLIpuUggEeClJJrVvqnbbg" name="Container p2">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLE_WUggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLFmYEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLB8AUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLB8CUggEeClJJrVvqnbbg" name="Container without children p3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLB8CkggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLCjE0ggEeClJJrVvqnbbg" name="Container without children p4">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLCjFEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_BXkP4eWoEd6JMo4lxOczEg"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_E26kAOi7Ed6VHqj_dPYIrw" name="DiagType8 of p2">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67sbIBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_E3Cf0Oi7Ed6VHqj_dPYIrw" type="Sirius" element="_E26kAOi7Ed6VHqj_dPYIrw" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_E3H_YOi7Ed6VHqj_dPYIrw" type="2002" element="_nLG0gEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_E3JNgOi7Ed6VHqj_dPYIrw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_E3JNgei7Ed6VHqj_dPYIrw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_E3JNgui7Ed6VHqj_dPYIrw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_E3JNg-i7Ed6VHqj_dPYIrw"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_E3i2IOi7Ed6VHqj_dPYIrw" type="3012" element="_nLHbmEggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_E3jdMOi7Ed6VHqj_dPYIrw" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_E3jdMei7Ed6VHqj_dPYIrw" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_E3w4kOi7Ed6VHqj_dPYIrw" type="3002" element="_nLHbmUggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_E3w4kei7Ed6VHqj_dPYIrw" fontName="Sans"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E3w4kui7Ed6VHqj_dPYIrw"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_E3i2Iei7Ed6VHqj_dPYIrw" fontName="Sans" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E3i2Iui7Ed6VHqj_dPYIrw" x="-22" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_E3H_Yei7Ed6VHqj_dPYIrw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E3H_Yui7Ed6VHqj_dPYIrw" x="200" y="100" width="309" height="79"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_E3J0kOi7Ed6VHqj_dPYIrw" type="2002" element="_nLG0iUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_E3J0k-i7Ed6VHqj_dPYIrw" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_E3KboOi7Ed6VHqj_dPYIrw" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_E3Kboei7Ed6VHqj_dPYIrw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_E3Kboui7Ed6VHqj_dPYIrw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_E3J0kei7Ed6VHqj_dPYIrw" fontName="Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E3J0kui7Ed6VHqj_dPYIrw" x="200" y="200" width="309" height="78"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_E3Cf0ei7Ed6VHqj_dPYIrw"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd8LDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd8bDFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLG0gEggEeClJJrVvqnbbg" name="Container without children p2-1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLHbmEggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLHbmUggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLG0gUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLG0iUggEeClJJrVvqnbbg" name="Container without children p2-2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLHbkEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_E26kAei7Ed6VHqj_dPYIrw"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_JnbuIPlNEd6Y1bDJsdKxyg" name="Type1 Raw Diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67tCMBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_Jo9_MPlNEd6Y1bDJsdKxyg" type="Sirius" element="_JnbuIPlNEd6Y1bDJsdKxyg" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_JqmW4PlNEd6Y1bDJsdKxyg" type="2002" element="_nLIpsEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_Jq544PlNEd6Y1bDJsdKxyg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_Jq__gPlNEd6Y1bDJsdKxyg" type="7001">
+            <children xmi:type="notation:Node" xmi:id="_JrJJcPlNEd6Y1bDJsdKxyg" type="3007" element="_nLJ32EggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_JrV9wPlNEd6Y1bDJsdKxyg" type="5003">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_JrV9wflNEd6Y1bDJsdKxyg" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_JriyEPlNEd6Y1bDJsdKxyg" type="3004" element="_nLKe4EggEeClJJrVvqnbbg">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_JriyEflNEd6Y1bDJsdKxyg" fontName="Segoe UI"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JriyEvlNEd6Y1bDJsdKxyg"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_JrJJcflNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LvZnUPxaEd6fe5GJbtZ0sw" x="105" y="124" width="61" height="18"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_JrWk0PlNEd6Y1bDJsdKxyg" type="3007" element="_nLKe50ggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_JrWk0_lNEd6Y1bDJsdKxyg" type="5003">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_JrWk1PlNEd6Y1bDJsdKxyg" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_JrjZIPlNEd6Y1bDJsdKxyg" type="3004" element="_nLKe6EggEeClJJrVvqnbbg">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_JrjZIflNEd6Y1bDJsdKxyg" fontName="Segoe UI"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrjZIvlNEd6Y1bDJsdKxyg"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_JrWk0flNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lva1cPxaEd6fe5GJbtZ0sw" x="165" y="39" width="30" height="30"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_JrXL4PlNEd6Y1bDJsdKxyg" type="3007" element="_nLLF8UggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_JrXL4_lNEd6Y1bDJsdKxyg" type="5003">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_JrXL5PlNEd6Y1bDJsdKxyg" y="5"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_JrkAMPlNEd6Y1bDJsdKxyg" type="3004" element="_nLLF8kggEeClJJrVvqnbbg">
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_JrkAMflNEd6Y1bDJsdKxyg" fontName="Segoe UI"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrkAMvlNEd6Y1bDJsdKxyg"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_JrXL4flNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lva1cfxaEd6fe5GJbtZ0sw" x="25" y="34" width="30" height="30"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Jq__gflNEd6Y1bDJsdKxyg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Jq__gvlNEd6Y1bDJsdKxyg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_JqmW4flNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JqmW4vlNEd6Y1bDJsdKxyg" x="425" y="55" width="311" height="234"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Jq__g_lNEd6Y1bDJsdKxyg" type="2002" element="_nLIpuUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_JrAmkflNEd6Y1bDJsdKxyg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_JrAmkvlNEd6Y1bDJsdKxyg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_JrAmk_lNEd6Y1bDJsdKxyg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_JrAmlPlNEd6Y1bDJsdKxyg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Jq__hPlNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrAmkPlNEd6Y1bDJsdKxyg" x="40" y="35" width="157" height="80"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_JrAmlflNEd6Y1bDJsdKxyg" type="2002" element="_nLJQw0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_JrBNoPlNEd6Y1bDJsdKxyg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_JrBNoflNEd6Y1bDJsdKxyg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_JrBNovlNEd6Y1bDJsdKxyg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_JrBNo_lNEd6Y1bDJsdKxyg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_JrAmlvlNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrAml_lNEd6Y1bDJsdKxyg" x="165" y="130" width="157" height="91"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_JrBNpPlNEd6Y1bDJsdKxyg" type="2002" element="_nLJQzEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_JrBNp_lNEd6Y1bDJsdKxyg" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_JrB0sPlNEd6Y1bDJsdKxyg" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_JrB0sflNEd6Y1bDJsdKxyg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_JrB0svlNEd6Y1bDJsdKxyg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_JrBNpflNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrBNpvlNEd6Y1bDJsdKxyg" x="35" y="230" width="168" height="80"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_Jo9_MflNEd6Y1bDJsdKxyg"/>
+        <edges xmi:type="notation:Edge" xmi:id="_JsBTMPlNEd6Y1bDJsdKxyg" type="4001" element="_nLMUEEggEeClJJrVvqnbbg" source="_JrJJcPlNEd6Y1bDJsdKxyg" target="_JrWk0PlNEd6Y1bDJsdKxyg">
+          <children xmi:type="notation:Node" xmi:id="_JsM5YPlNEd6Y1bDJsdKxyg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zNmNMoRLEeOg_8QSiaL3XA" x="10" y="27"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oA4BdpkKEeCez7uszjfVoA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oA4Bd5kKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_oA4BeJkKEeCez7uszjfVoA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oA4BeZkKEeCez7uszjfVoA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_JsBTMflNEd6Y1bDJsdKxyg"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_JsBTMvlNEd6Y1bDJsdKxyg" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LvZnUfxaEd6fe5GJbtZ0sw" points="[27, 8, -274, 0]$[288, 8, -13, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y3DqMfxYEd6fe5GJbtZ0sw" id="(0.41666666,0.057142857)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y3DqMvxYEd6fe5GJbtZ0sw" id="(0.57894737,0.94285715)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd8rDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd87DFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLIpsEggEeClJJrVvqnbbg" name="Container p1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLIpsUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nLJ32EggEeClJJrVvqnbbg" name="C1-1" outgoingEdges="_nLMUEEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLIpukggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJQwEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJQwUggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJQwkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLIpvkggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nLKe4EggEeClJJrVvqnbbg">
+          <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLJQw0ggEeClJJrVvqnbbg" name="Container p3">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nLKe50ggEeClJJrVvqnbbg" name="C1-2" incomingEdges="_nLMUEEggEeClJJrVvqnbbg" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLJQxEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJQyUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJQykggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJQy0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJQyEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nLKe6EggEeClJJrVvqnbbg">
+          <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLJQzEggEeClJJrVvqnbbg" name="Container p4">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_nLLF8UggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
         <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
         <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
         <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLJ30EggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJ31UggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJ31kggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJ310ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLJ31EggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_nLLF8kggEeClJJrVvqnbbg">
+          <description xmi:type="style:BundledImageDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nLMUEEggEeClJJrVvqnbbg" name="aC1-2" sourceNode="_nLJ32EggEeClJJrVvqnbbg" targetNode="_nLKe50ggEeClJJrVvqnbbg">
-        <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
-        <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
-        <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_JpbSMflNEd6Y1bDJsdKxyg">
-          <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@edgeMappings[name='DT1_EReference']/@style"/>
-          <strokeColor xmi:type="viewpoint:RGBValues" xmi:id="_JpbSMvlNEd6Y1bDJsdKxyg" red="136" green="136" blue="136"/>
-          <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOdEggEeClJJrVvqnbbg" showIcon="false">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_JWFBgDV2EeKMTft4yhZhAw"/>
-          </centerLabelStyle>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@edgeMappings[name='DT1_EReference']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_JnbuIflNEd6Y1bDJsdKxyg"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_AE9PEfoNEd6aXOd_1RF62g" name="Type7 Raw Diagram">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67tpQBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_AFYF0PoNEd6aXOd_1RF62g" type="Sirius" element="_AE9PEfoNEd6aXOd_1RF62g" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_AGQ2oPoNEd6aXOd_1RF62g" type="2002" element="_nLM7IEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_AGVIEPoNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_AGWWMPoNEd6aXOd_1RF62g" type="7001">
-              <children xmi:type="notation:Node" xmi:id="_AGcc0PoNEd6aXOd_1RF62g" type="3008" element="_nLQlgEggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_AGdq8PoNEd6aXOd_1RF62g" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_AGe5EPoNEd6aXOd_1RF62g" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_AGe5EfoNEd6aXOd_1RF62g"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_AGe5EvoNEd6aXOd_1RF62g"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_AHMDsPoNEd6aXOd_1RF62g" type="3012" element="_nLRzoEggEeClJJrVvqnbbg">
-                  <children xmi:type="notation:Node" xmi:id="_AHMDs_oNEd6aXOd_1RF62g" type="5010">
-                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AHMDtPoNEd6aXOd_1RF62g" y="5"/>
-                  </children>
-                  <children xmi:type="notation:Node" xmi:id="_AHPHAPoNEd6aXOd_1RF62g" type="3002" element="_nLRzoUggEeClJJrVvqnbbg">
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AHPHAfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHPHAvoNEd6aXOd_1RF62g"/>
-                  </children>
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AHMDsfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHMDsvoNEd6aXOd_1RF62g" x="1" y="-22" width="30" height="30"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLIpuUggEeClJJrVvqnbbg" name="Container p2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLIpukggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLJQw0ggEeClJJrVvqnbbg" name="Container p3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLJQxEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLJQzEggEeClJJrVvqnbbg" name="Container p4">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLJ30EggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_nLMUEEggEeClJJrVvqnbbg" name="aC1-2" sourceNode="_nLJ32EggEeClJJrVvqnbbg" targetNode="_nLKe50ggEeClJJrVvqnbbg">
+      <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_JpbSMflNEd6Y1bDJsdKxyg">
+        <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@edgeMappings[name='DT1_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l1zOdEggEeClJJrVvqnbbg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@edgeMappings[name='DT1_EReference']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_JnbuIflNEd6Y1bDJsdKxyg"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_AE9PEfoNEd6aXOd_1RF62g" name="Type7 Raw Diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67tpQBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_AFYF0PoNEd6aXOd_1RF62g" type="Sirius" element="_AE9PEfoNEd6aXOd_1RF62g" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_AGQ2oPoNEd6aXOd_1RF62g" type="2002" element="_nLM7IEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_AGVIEPoNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_AGWWMPoNEd6aXOd_1RF62g" type="7001">
+            <children xmi:type="notation:Node" xmi:id="_AGcc0PoNEd6aXOd_1RF62g" type="3008" element="_nLQlgEggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_AGdq8PoNEd6aXOd_1RF62g" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_AGe5EPoNEd6aXOd_1RF62g" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_AGe5EfoNEd6aXOd_1RF62g"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_AGe5EvoNEd6aXOd_1RF62g"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_AHMDsPoNEd6aXOd_1RF62g" type="3012" element="_nLRzoEggEeClJJrVvqnbbg">
+                <children xmi:type="notation:Node" xmi:id="_AHMDs_oNEd6aXOd_1RF62g" type="5010">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_AHMDtPoNEd6aXOd_1RF62g" y="5"/>
                 </children>
-                <children xmi:type="notation:Node" xmi:id="_AHMqwPoNEd6aXOd_1RF62g" type="3012" element="_nLRzqEggEeClJJrVvqnbbg">
-                  <children xmi:type="notation:Node" xmi:id="_AHMqw_oNEd6aXOd_1RF62g" type="5010">
-                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AHMqxPoNEd6aXOd_1RF62g" y="5"/>
-                  </children>
-                  <children xmi:type="notation:Node" xmi:id="_AHSKUPoNEd6aXOd_1RF62g" type="3002" element="_nLRzqUggEeClJJrVvqnbbg">
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AHSKUfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHSKUvoNEd6aXOd_1RF62g"/>
-                  </children>
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AHMqwfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHMqwvoNEd6aXOd_1RF62g" x="-22" y="8" width="30" height="30"/>
+                <children xmi:type="notation:Node" xmi:id="_AHPHAPoNEd6aXOd_1RF62g" type="3002" element="_nLRzoUggEeClJJrVvqnbbg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AHPHAfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHPHAvoNEd6aXOd_1RF62g"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_AGcc0foNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGcc0voNEd6aXOd_1RF62g" x="-26" y="-23" width="174" height="85"/>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_AHMDsfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHMDsvoNEd6aXOd_1RF62g" x="1" y="-22" width="30" height="30"/>
               </children>
-              <children xmi:type="notation:Node" xmi:id="_AGfgIPoNEd6aXOd_1RF62g" type="3008" element="_nLQliUggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_AGfgI_oNEd6aXOd_1RF62g" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_AGfgJPoNEd6aXOd_1RF62g" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_AGfgJfoNEd6aXOd_1RF62g"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_AGfgJvoNEd6aXOd_1RF62g"/>
-                </children>
-                <children xmi:type="notation:Node" xmi:id="_AHT_gPoNEd6aXOd_1RF62g" type="3012" element="_nLSas0ggEeClJJrVvqnbbg">
-                  <children xmi:type="notation:Node" xmi:id="_AHT_g_oNEd6aXOd_1RF62g" type="5010">
-                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AHT_hPoNEd6aXOd_1RF62g" y="5"/>
-                  </children>
-                  <children xmi:type="notation:Node" xmi:id="_AHV0sPoNEd6aXOd_1RF62g" type="3002" element="_nLSatEggEeClJJrVvqnbbg">
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AHV0sfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHV0svoNEd6aXOd_1RF62g"/>
-                  </children>
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AHT_gfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHT_gvoNEd6aXOd_1RF62g" y="-22" width="30" height="30"/>
+              <children xmi:type="notation:Node" xmi:id="_AHMqwPoNEd6aXOd_1RF62g" type="3012" element="_nLRzqEggEeClJJrVvqnbbg">
+                <children xmi:type="notation:Node" xmi:id="_AHMqw_oNEd6aXOd_1RF62g" type="5010">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_AHMqxPoNEd6aXOd_1RF62g" y="5"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_AGfgIfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGfgIvoNEd6aXOd_1RF62g" x="-32" y="-23" width="157" height="83"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_AGgHMPoNEd6aXOd_1RF62g" type="3008" element="_nLRMk0ggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_AGgHM_oNEd6aXOd_1RF62g" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_AGgHNPoNEd6aXOd_1RF62g" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_AGgHNfoNEd6aXOd_1RF62g"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_AGgHNvoNEd6aXOd_1RF62g"/>
+                <children xmi:type="notation:Node" xmi:id="_AHSKUPoNEd6aXOd_1RF62g" type="3002" element="_nLRzqUggEeClJJrVvqnbbg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AHSKUfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHSKUvoNEd6aXOd_1RF62g"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_AGgHMfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGgHMvoNEd6aXOd_1RF62g" x="-26" y="-23" width="157" height="73"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_AGWWMfoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_AGWWMvoNEd6aXOd_1RF62g"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_AHHLMPoNEd6aXOd_1RF62g" type="3012" element="_nLOwWEggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_AHHyQPoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_AHIZUPoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_AHXp4PoNEd6aXOd_1RF62g" type="3002" element="_nLPXYEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_AHXp4foNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHXp4voNEd6aXOd_1RF62g"/>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_AHMqwfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHMqwvoNEd6aXOd_1RF62g" x="-22" y="8" width="30" height="30"/>
               </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_AHHLMfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHHLMvoNEd6aXOd_1RF62g" x="-22" y="30" width="30" height="30"/>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_AGcc0foNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGcc0voNEd6aXOd_1RF62g" x="-26" y="-23" width="174" height="85"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_AHIZUfoNEd6aXOd_1RF62g" type="3012" element="_nLPXZ0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_AHJAYPoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_AHJAYfoNEd6aXOd_1RF62g" y="5"/>
+            <children xmi:type="notation:Node" xmi:id="_AGfgIPoNEd6aXOd_1RF62g" type="3008" element="_nLQliUggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_AGfgI_oNEd6aXOd_1RF62g" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_AGfgJPoNEd6aXOd_1RF62g" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_AGfgJfoNEd6aXOd_1RF62g"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_AGfgJvoNEd6aXOd_1RF62g"/>
               </children>
-              <children xmi:type="notation:Node" xmi:id="_AHY4APoNEd6aXOd_1RF62g" type="3002" element="_nLPXaEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_AHY4AfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHY4AvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_AHIZUvoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHIZU_oNEd6aXOd_1RF62g" x="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_AHJAYvoNEd6aXOd_1RF62g" type="3012" element="_nLP-cUggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_AHJAZfoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_AHJAZvoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_AHaGIPoNEd6aXOd_1RF62g" type="3002" element="_nLP-ckggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_AHaGIfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHaGIvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_AHJAY_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHJAZPoNEd6aXOd_1RF62g" x="9" y="70" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_AGQ2ofoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGQ2ovoNEd6aXOd_1RF62g" width="157" height="80"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_AGW9QPoNEd6aXOd_1RF62g" type="2002" element="_nLNiOEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_AGXkUPoNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_AGXkUfoNEd6aXOd_1RF62g" type="7001">
-              <children xmi:type="notation:Node" xmi:id="_AGguQPoNEd6aXOd_1RF62g" type="3008" element="_nLTBwEggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_AGguQ_oNEd6aXOd_1RF62g" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_AGguRPoNEd6aXOd_1RF62g" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_AGguRfoNEd6aXOd_1RF62g"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_AGguRvoNEd6aXOd_1RF62g"/>
+              <children xmi:type="notation:Node" xmi:id="_AHT_gPoNEd6aXOd_1RF62g" type="3012" element="_nLSas0ggEeClJJrVvqnbbg">
+                <children xmi:type="notation:Node" xmi:id="_AHT_g_oNEd6aXOd_1RF62g" type="5010">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_AHT_hPoNEd6aXOd_1RF62g" y="5"/>
                 </children>
-                <children xmi:type="notation:Node" xmi:id="_AHovoPoNEd6aXOd_1RF62g" type="3012" element="_nLTo20ggEeClJJrVvqnbbg">
-                  <children xmi:type="notation:Node" xmi:id="_AHpWsPoNEd6aXOd_1RF62g" type="5010">
-                    <layoutConstraint xmi:type="notation:Location" xmi:id="_AHpWsfoNEd6aXOd_1RF62g" x="31" y="15"/>
-                  </children>
-                  <children xmi:type="notation:Node" xmi:id="_AHqk0PoNEd6aXOd_1RF62g" type="3002" element="_nLUP4EggEeClJJrVvqnbbg">
-                    <styles xmi:type="notation:ShapeStyle" xmi:id="_AHqk0foNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHqk0voNEd6aXOd_1RF62g"/>
-                  </children>
-                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AHovofoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHovovoNEd6aXOd_1RF62g" x="13" y="-22" width="30" height="30"/>
+                <children xmi:type="notation:Node" xmi:id="_AHV0sPoNEd6aXOd_1RF62g" type="3002" element="_nLSatEggEeClJJrVvqnbbg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AHV0sfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHV0svoNEd6aXOd_1RF62g"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_AGguQfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGguQvoNEd6aXOd_1RF62g" x="6" y="5" width="178" height="85"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_AGhVUPoNEd6aXOd_1RF62g" type="3008" element="_nLTo0kggEeClJJrVvqnbbg">
-                <children xmi:type="notation:Node" xmi:id="_AGhVU_oNEd6aXOd_1RF62g" type="5005"/>
-                <children xmi:type="notation:Node" xmi:id="_AGhVVPoNEd6aXOd_1RF62g" type="7002">
-                  <styles xmi:type="notation:SortingStyle" xmi:id="_AGhVVfoNEd6aXOd_1RF62g"/>
-                  <styles xmi:type="notation:FilteringStyle" xmi:id="_AGhVVvoNEd6aXOd_1RF62g"/>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_AHT_gfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHT_gvoNEd6aXOd_1RF62g" y="-22" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_AGfgIfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGfgIvoNEd6aXOd_1RF62g" x="-32" y="-23" width="157" height="83"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_AGgHMPoNEd6aXOd_1RF62g" type="3008" element="_nLRMk0ggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_AGgHM_oNEd6aXOd_1RF62g" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_AGgHNPoNEd6aXOd_1RF62g" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_AGgHNfoNEd6aXOd_1RF62g"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_AGgHNvoNEd6aXOd_1RF62g"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_AGgHMfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGgHMvoNEd6aXOd_1RF62g" x="-26" y="-23" width="157" height="73"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_AGWWMfoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_AGWWMvoNEd6aXOd_1RF62g"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_AHHLMPoNEd6aXOd_1RF62g" type="3012" element="_nLOwWEggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_AHHyQPoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_AHIZUPoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_AHXp4PoNEd6aXOd_1RF62g" type="3002" element="_nLPXYEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_AHXp4foNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHXp4voNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_AHHLMfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHHLMvoNEd6aXOd_1RF62g" x="-22" y="30" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_AHIZUfoNEd6aXOd_1RF62g" type="3012" element="_nLPXZ0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_AHJAYPoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_AHJAYfoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_AHY4APoNEd6aXOd_1RF62g" type="3002" element="_nLPXaEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_AHY4AfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHY4AvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_AHIZUvoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHIZU_oNEd6aXOd_1RF62g" x="-22" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_AHJAYvoNEd6aXOd_1RF62g" type="3012" element="_nLP-cUggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_AHJAZfoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_AHJAZvoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_AHaGIPoNEd6aXOd_1RF62g" type="3002" element="_nLP-ckggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_AHaGIfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHaGIvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_AHJAY_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHJAZPoNEd6aXOd_1RF62g" x="9" y="70" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_AGQ2ofoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGQ2ovoNEd6aXOd_1RF62g" width="157" height="80"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_AGW9QPoNEd6aXOd_1RF62g" type="2002" element="_nLNiOEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_AGXkUPoNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_AGXkUfoNEd6aXOd_1RF62g" type="7001">
+            <children xmi:type="notation:Node" xmi:id="_AGguQPoNEd6aXOd_1RF62g" type="3008" element="_nLTBwEggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_AGguQ_oNEd6aXOd_1RF62g" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_AGguRPoNEd6aXOd_1RF62g" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_AGguRfoNEd6aXOd_1RF62g"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_AGguRvoNEd6aXOd_1RF62g"/>
+              </children>
+              <children xmi:type="notation:Node" xmi:id="_AHovoPoNEd6aXOd_1RF62g" type="3012" element="_nLTo20ggEeClJJrVvqnbbg">
+                <children xmi:type="notation:Node" xmi:id="_AHpWsPoNEd6aXOd_1RF62g" type="5010">
+                  <layoutConstraint xmi:type="notation:Location" xmi:id="_AHpWsfoNEd6aXOd_1RF62g" x="31" y="15"/>
                 </children>
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_AGhVUfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGhVUvoNEd6aXOd_1RF62g" x="6" y="5" width="157" height="80"/>
-              </children>
-              <styles xmi:type="notation:SortingStyle" xmi:id="_AGXkUvoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_AGXkU_oNEd6aXOd_1RF62g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_AGW9QfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGW9QvoNEd6aXOd_1RF62g" x="-22" width="234" height="190"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_AGYLYPoNEd6aXOd_1RF62g" type="2002" element="_nLOJQ0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_AGYycPoNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_AGYycfoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_AGYycvoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_AGYyc_oNEd6aXOd_1RF62g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_AGYLYfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGYLYvoNEd6aXOd_1RF62g" x="-11" y="11" width="135" height="102"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_AGZZgPoNEd6aXOd_1RF62g" type="2002" element="_nLOJTEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_AGaAkPoNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_AGaAkfoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_AGaAkvoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_AGaAk_oNEd6aXOd_1RF62g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_AGZZgfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGZZgvoNEd6aXOd_1RF62g" x="-11" y="11" width="135" height="102"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_AFYF0foNEd6aXOd_1RF62g"/>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLM7IEggEeClJJrVvqnbbg" name="Container without children p1">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLOwWEggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLPXYEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLPXZEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLPXZUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLPXZkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLPXZ0ggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLPXaEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLPXbEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLPXbUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLP-cEggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLP-cUggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLP-ckggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLP-dkggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLP-d0ggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLP-eEggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLNiMEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLNiNUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLNiNkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLNiN0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLNiNEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLQlgEggEeClJJrVvqnbbg" name="Container without children p1-1">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
-          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLRzoEggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="NSEW">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-            <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLRzoUggEeClJJrVvqnbbg">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLRzpUggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLRzpkggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLRzp0ggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-          </ownedBorderedNodes>
-          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLRzqEggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="NSEW">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-            <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLRzqUggEeClJJrVvqnbbg">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLSasEggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLSasUggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLSaskggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-          </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLQlgUggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLQlhkggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLQlh0ggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLQliEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLQlhUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLQliUggEeClJJrVvqnbbg" name="Container without children p1-2">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
-          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLSas0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="NSEW">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-            <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLSatEggEeClJJrVvqnbbg">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLSauEggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLSauUggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLSaukggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-          </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLQlikggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLRMkEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLRMkUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLRMkkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLQljkggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLRMk0ggEeClJJrVvqnbbg" name="Container without children p1-3">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLRMlEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLRMmUggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLRMmkggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLRMm0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLRMmEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        </ownedDiagramElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLNiOEggEeClJJrVvqnbbg" name="Container without children p2">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLNiOUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOJQEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOJQUggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOJQkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLNiPUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLTBwEggEeClJJrVvqnbbg" name="Container without children p2-1">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
-          <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLTo20ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="NSEW">
-            <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-            <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-            <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLUP4EggEeClJJrVvqnbbg">
-              <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLUP5EggEeClJJrVvqnbbg"/>
-              <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
-              <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLUP5UggEeClJJrVvqnbbg"/>
-              <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLUP5kggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-            </ownedStyle>
-            <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
-          </ownedBorderedNodes>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLTBwUggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLTBxkggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLTo0EggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLTo0UggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLTBxUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        </ownedDiagramElements>
-        <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLTo0kggEeClJJrVvqnbbg" name="Container without children p2-2">
-          <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
-          <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
-          <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLTo00ggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLTo2EggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLTo2UggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLTo2kggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-            <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLTo10ggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-        </ownedDiagramElements>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLOJQ0ggEeClJJrVvqnbbg" name="Container without children p3">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLOJREggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOJSUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOJSkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOJS0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOJSEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLOJTEggEeClJJrVvqnbbg" name="Container without children p4">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLOwUEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOwVUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOwVkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOwV0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLOwVEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+                <children xmi:type="notation:Node" xmi:id="_AHqk0PoNEd6aXOd_1RF62g" type="3002" element="_nLUP4EggEeClJJrVvqnbbg">
+                  <styles xmi:type="notation:ShapeStyle" xmi:id="_AHqk0foNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHqk0voNEd6aXOd_1RF62g"/>
+                </children>
+                <styles xmi:type="notation:ShapeStyle" xmi:id="_AHovofoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHovovoNEd6aXOd_1RF62g" x="13" y="-22" width="30" height="30"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_AGguQfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGguQvoNEd6aXOd_1RF62g" x="6" y="5" width="178" height="85"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_AGhVUPoNEd6aXOd_1RF62g" type="3008" element="_nLTo0kggEeClJJrVvqnbbg">
+              <children xmi:type="notation:Node" xmi:id="_AGhVU_oNEd6aXOd_1RF62g" type="5005"/>
+              <children xmi:type="notation:Node" xmi:id="_AGhVVPoNEd6aXOd_1RF62g" type="7002">
+                <styles xmi:type="notation:SortingStyle" xmi:id="_AGhVVfoNEd6aXOd_1RF62g"/>
+                <styles xmi:type="notation:FilteringStyle" xmi:id="_AGhVVvoNEd6aXOd_1RF62g"/>
+              </children>
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_AGhVUfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGhVUvoNEd6aXOd_1RF62g" x="6" y="5" width="157" height="80"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_AGXkUvoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_AGXkU_oNEd6aXOd_1RF62g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_AGW9QfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGW9QvoNEd6aXOd_1RF62g" x="-22" width="234" height="190"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_AGYLYPoNEd6aXOd_1RF62g" type="2002" element="_nLOJQ0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_AGYycPoNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_AGYycfoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_AGYycvoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_AGYyc_oNEd6aXOd_1RF62g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_AGYLYfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGYLYvoNEd6aXOd_1RF62g" x="-11" y="11" width="135" height="102"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_AGZZgPoNEd6aXOd_1RF62g" type="2002" element="_nLOJTEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_AGaAkPoNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_AGaAkfoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_AGaAkvoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_AGaAk_oNEd6aXOd_1RF62g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_AGZZgfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGZZgvoNEd6aXOd_1RF62g" x="-11" y="11" width="135" height="102"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_AFYF0foNEd6aXOd_1RF62g"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd9LDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd9bDFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLM7IEggEeClJJrVvqnbbg" name="Container without children p1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLOwWEggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLPXYEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_AE9PEvoNEd6aXOd_1RF62g"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_J56iAPoNEd6aXOd_1RF62g" name="Type8 Raw Diagram">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67u3YBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_J6JLgPoNEd6aXOd_1RF62g" type="Sirius" element="_J56iAPoNEd6aXOd_1RF62g" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_J6P5MPoNEd6aXOd_1RF62g" type="2002" element="_nLVeAEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_J6P5M_oNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_J6P5NPoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_J6P5NfoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_J6P5NvoNEd6aXOd_1RF62g"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_J6oTsPoNEd6aXOd_1RF62g" type="3012" element="_nLZvc0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_J6o6wPoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_J6o6wfoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_J6qv8PoNEd6aXOd_1RF62g" type="3002" element="_nLZvdEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_J6qv8foNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6qv8voNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_J6oTsfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6oTsvoNEd6aXOd_1RF62g" x="6" y="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_J6o6wvoNEd6aXOd_1RF62g" type="3012" element="_nLaWgkggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_J6o6xfoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_J6o6xvoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_J6r-EPoNEd6aXOd_1RF62g" type="3002" element="_nLaWg0ggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_J6r-EfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6r-EvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_J6o6w_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6o6xPoNEd6aXOd_1RF62g" x="-22" y="8" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_J6o6x_oNEd6aXOd_1RF62g" type="3012" element="_nLaWikggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_J6ph0voNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_J6ph0_oNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_J6tMMPoNEd6aXOd_1RF62g" type="3002" element="_nLaWi0ggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_J6tMMfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6tMMvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_J6ph0PoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6ph0foNEd6aXOd_1RF62g" x="-22" y="39" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6P5MfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6P5MvoNEd6aXOd_1RF62g" x="-11" y="11" width="179" height="102"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J6P5N_oNEd6aXOd_1RF62g" type="2002" element="_nLWFEUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_J6QgQPoNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_J6QgQfoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_J6QgQvoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_J6QgQ_oNEd6aXOd_1RF62g"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_J6vocPoNEd6aXOd_1RF62g" type="3012" element="_nLa9k0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_J6voc_oNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_J6vodPoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_J6w2kPoNEd6aXOd_1RF62g" type="3002" element="_nLa9lEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_J6xdoPoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6xdofoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_J6vocfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6vocvoNEd6aXOd_1RF62g" x="8" y="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_J6vodfoNEd6aXOd_1RF62g" type="3012" element="_nLa9m0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_J6voePoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_J6wPgPoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_J6yrwPoNEd6aXOd_1RF62g" type="3002" element="_nLbkoEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_J6yrwfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6yrwvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_J6vodvoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6vod_oNEd6aXOd_1RF62g" x="-22" y="8" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6P5OPoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6P5OfoNEd6aXOd_1RF62g" x="-11" y="11" width="311" height="113"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J6QgRPoNEd6aXOd_1RF62g" type="2002" element="_nLWsIkggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_J6QgR_oNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_J6QgSPoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_J6QgSfoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_J6QgSvoNEd6aXOd_1RF62g"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_J60g8PoNEd6aXOd_1RF62g" type="3012" element="_nLbkp0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_J60g8_oNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_J60g9PoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_J61vEPoNEd6aXOd_1RF62g" type="3002" element="_nLbkqEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_J61vEfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J61vEvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_J60g8foNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J60g8voNEd6aXOd_1RF62g" x="6" y="-22" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6QgRfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6QgRvoNEd6aXOd_1RF62g" x="-11" y="11" width="157" height="58"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J6RHUPoNEd6aXOd_1RF62g" type="2002" element="_nLWsK0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_J6RHU_oNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_J6RHVPoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_J6RHVfoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_J6RHVvoNEd6aXOd_1RF62g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6RHUfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6RHUvoNEd6aXOd_1RF62g" x="-11" y="11" width="146" height="58"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J6RHV_oNEd6aXOd_1RF62g" type="2002" element="_nLXTM0ggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_J6RHWvoNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_J6RuYPoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_J6RuYfoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_J6RuYvoNEd6aXOd_1RF62g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6RHWPoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6RHWfoNEd6aXOd_1RF62g" x="-11" y="11" width="124" height="102"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J6RuY_oNEd6aXOd_1RF62g" type="2002" element="_nLXTPEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_J6RuZvoNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_J6RuZ_oNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_J6RuaPoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_J6RuafoNEd6aXOd_1RF62g"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_J63kQPoNEd6aXOd_1RF62g" type="3012" element="_nLcLs0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_J64LUPoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_J64LUfoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_J65ZcPoNEd6aXOd_1RF62g" type="3002" element="_nLcLtEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_J65ZcfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J65ZcvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_J63kQfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J63kQvoNEd6aXOd_1RF62g" x="-22" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6RuZPoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6RuZfoNEd6aXOd_1RF62g" x="-11" y="11" width="135" height="69"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J6RuavoNEd6aXOd_1RF62g" type="2002" element="_nLX6SEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_J6SVcPoNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_J6SVcfoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_J6SVcvoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_J6SVc_oNEd6aXOd_1RF62g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6Rua_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6RubPoNEd6aXOd_1RF62g" x="-11" y="11" width="124" height="58"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J6SVdPoNEd6aXOd_1RF62g" type="2002" element="_nLZIYEggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_J6SVd_oNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_J6SVePoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_J6SVefoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_J6SVevoNEd6aXOd_1RF62g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6SVdfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6SVdvoNEd6aXOd_1RF62g" x="-11" y="11" width="135" height="58"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_J6S8gPoNEd6aXOd_1RF62g" type="2002" element="_nLZIaUggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_J6S8g_oNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_J6S8hPoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_J6S8hfoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_J6S8hvoNEd6aXOd_1RF62g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6S8gfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6S8gvoNEd6aXOd_1RF62g" x="-11" y="11" width="124" height="69"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_J6JLgfoNEd6aXOd_1RF62g"/>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLVeAEggEeClJJrVvqnbbg" name="Container without children p1">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLZvc0ggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="EAST_WEST">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLZvdEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLZveEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLaWgEggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLaWgUggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLaWgkggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="EAST_WEST">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLaWg0ggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLaWh0ggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLaWiEggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLaWiUggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLaWikggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="EAST_WEST">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLaWi0ggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLa9kEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLa9kUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLa9kkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLVeAUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLVeBkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLVeB0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLWFEEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLVeBUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLPXZ0ggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLPXaEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLWFEUggEeClJJrVvqnbbg" name="Container without children p1-1">
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLP-cUggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLP-ckggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLNiMEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLQlgEggEeClJJrVvqnbbg" name="Container without children p1-1">
         <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
         <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLa9k0ggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="EAST_WEST">
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLRzoEggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="NSEW">
           <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
           <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLa9lEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLa9mEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLa9mUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLa9mkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLRzoUggEeClJJrVvqnbbg">
+            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
         </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLa9m0ggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="EAST_WEST">
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLRzqEggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="NSEW">
           <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
           <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLbkoEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLbkpEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLbkpUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLbkpkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLRzqUggEeClJJrVvqnbbg">
+            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLWFEkggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLWFF0ggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLWsIEggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLWsIUggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLWFFkggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLQlgUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLWsIkggEeClJJrVvqnbbg" name="Container without children p1-2">
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLQliUggEeClJJrVvqnbbg" name="Container without children p1-2">
         <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
         <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLbkp0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="EAST_WEST">
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLSas0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="NSEW">
           <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
           <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLbkqEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLcLsEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLcLsUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLcLskggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLSatEggEeClJJrVvqnbbg">
+            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLWsI0ggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLWsKEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLWsKUggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLWsKkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLWsJ0ggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLQlikggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLWsK0ggEeClJJrVvqnbbg" name="Container without children p1-3">
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLRMk0ggEeClJJrVvqnbbg" name="Container without children p1-3">
         <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
         <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLWsLEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLXTMEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLXTMUggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLXTMkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLWsMEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLXTM0ggEeClJJrVvqnbbg" name="Container without children p2">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLXTNEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLXTOUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLXTOkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLXTO0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLXTOEggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLRMlEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLXTPEggEeClJJrVvqnbbg" name="Container without children p2-1">
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLNiOEggEeClJJrVvqnbbg" name="Container without children p2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLNiOUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLTBwEggEeClJJrVvqnbbg" name="Container without children p2-1">
         <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
         <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLcLs0ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="EAST_WEST">
+        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLTo20ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="NSEW">
           <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
           <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLcLtEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLcywEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLcywUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLcywkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
+          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLUP4EggEeClJJrVvqnbbg">
+            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']/@style"/>
           </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@borderedNodeMappings[name='DT7_Class']"/>
         </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLX6QEggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLX6RUggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLX6RkggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLX6R0ggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLX6REggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLTBwUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLX6SEggEeClJJrVvqnbbg" name="Container without children p2-2">
+      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLTo0kggEeClJJrVvqnbbg" name="Container without children p2-2">
         <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
         <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLX6SUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLX6TkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLX6T0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLX6UEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLX6TUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLTo00ggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
       </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLZIYEggEeClJJrVvqnbbg" name="Container without children p3">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLZIYUggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLZIZkggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLZIZ0ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLZIaEggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLZIZUggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLOJQ0ggEeClJJrVvqnbbg" name="Container without children p3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLOJREggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLOJTEggEeClJJrVvqnbbg" name="Container without children p4">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLOwUEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']/@containerMappings[name='DT7_Package']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType7']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_AE9PEvoNEd6aXOd_1RF62g"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_J56iAPoNEd6aXOd_1RF62g" name="Type8 Raw Diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67u3YBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_J6JLgPoNEd6aXOd_1RF62g" type="Sirius" element="_J56iAPoNEd6aXOd_1RF62g" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_J6P5MPoNEd6aXOd_1RF62g" type="2002" element="_nLVeAEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_J6P5M_oNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_J6P5NPoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J6P5NfoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J6P5NvoNEd6aXOd_1RF62g"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J6oTsPoNEd6aXOd_1RF62g" type="3012" element="_nLZvc0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_J6o6wPoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J6o6wfoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J6qv8PoNEd6aXOd_1RF62g" type="3002" element="_nLZvdEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_J6qv8foNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6qv8voNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6oTsfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6oTsvoNEd6aXOd_1RF62g" x="6" y="-22" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J6o6wvoNEd6aXOd_1RF62g" type="3012" element="_nLaWgkggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_J6o6xfoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J6o6xvoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J6r-EPoNEd6aXOd_1RF62g" type="3002" element="_nLaWg0ggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_J6r-EfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6r-EvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6o6w_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6o6xPoNEd6aXOd_1RF62g" x="-22" y="8" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J6o6x_oNEd6aXOd_1RF62g" type="3012" element="_nLaWikggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_J6ph0voNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J6ph0_oNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J6tMMPoNEd6aXOd_1RF62g" type="3002" element="_nLaWi0ggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_J6tMMfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6tMMvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6ph0PoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6ph0foNEd6aXOd_1RF62g" x="-22" y="39" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J6P5MfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6P5MvoNEd6aXOd_1RF62g" x="-11" y="11" width="179" height="102"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J6P5N_oNEd6aXOd_1RF62g" type="2002" element="_nLWFEUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_J6QgQPoNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_J6QgQfoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J6QgQvoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J6QgQ_oNEd6aXOd_1RF62g"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J6vocPoNEd6aXOd_1RF62g" type="3012" element="_nLa9k0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_J6voc_oNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J6vodPoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J6w2kPoNEd6aXOd_1RF62g" type="3002" element="_nLa9lEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_J6xdoPoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6xdofoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6vocfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6vocvoNEd6aXOd_1RF62g" x="8" y="-22" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J6vodfoNEd6aXOd_1RF62g" type="3012" element="_nLa9m0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_J6voePoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J6wPgPoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J6yrwPoNEd6aXOd_1RF62g" type="3002" element="_nLbkoEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_J6yrwfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6yrwvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_J6vodvoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6vod_oNEd6aXOd_1RF62g" x="-22" y="8" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J6P5OPoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6P5OfoNEd6aXOd_1RF62g" x="-11" y="11" width="311" height="113"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J6QgRPoNEd6aXOd_1RF62g" type="2002" element="_nLWsIkggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_J6QgR_oNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_J6QgSPoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J6QgSfoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J6QgSvoNEd6aXOd_1RF62g"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J60g8PoNEd6aXOd_1RF62g" type="3012" element="_nLbkp0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_J60g8_oNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J60g9PoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J61vEPoNEd6aXOd_1RF62g" type="3002" element="_nLbkqEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_J61vEfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J61vEvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_J60g8foNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J60g8voNEd6aXOd_1RF62g" x="6" y="-22" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J6QgRfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6QgRvoNEd6aXOd_1RF62g" x="-11" y="11" width="157" height="58"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J6RHUPoNEd6aXOd_1RF62g" type="2002" element="_nLWsK0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_J6RHU_oNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_J6RHVPoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J6RHVfoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J6RHVvoNEd6aXOd_1RF62g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J6RHUfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6RHUvoNEd6aXOd_1RF62g" x="-11" y="11" width="146" height="58"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J6RHV_oNEd6aXOd_1RF62g" type="2002" element="_nLXTM0ggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_J6RHWvoNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_J6RuYPoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J6RuYfoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J6RuYvoNEd6aXOd_1RF62g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J6RHWPoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6RHWfoNEd6aXOd_1RF62g" x="-11" y="11" width="124" height="102"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J6RuY_oNEd6aXOd_1RF62g" type="2002" element="_nLXTPEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_J6RuZvoNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_J6RuZ_oNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J6RuaPoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J6RuafoNEd6aXOd_1RF62g"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_J63kQPoNEd6aXOd_1RF62g" type="3012" element="_nLcLs0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_J64LUPoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_J64LUfoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_J65ZcPoNEd6aXOd_1RF62g" type="3002" element="_nLcLtEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_J65ZcfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J65ZcvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_J63kQfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J63kQvoNEd6aXOd_1RF62g" x="-22" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J6RuZPoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6RuZfoNEd6aXOd_1RF62g" x="-11" y="11" width="135" height="69"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J6RuavoNEd6aXOd_1RF62g" type="2002" element="_nLX6SEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_J6SVcPoNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_J6SVcfoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J6SVcvoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J6SVc_oNEd6aXOd_1RF62g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J6Rua_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6RubPoNEd6aXOd_1RF62g" x="-11" y="11" width="124" height="58"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J6SVdPoNEd6aXOd_1RF62g" type="2002" element="_nLZIYEggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_J6SVd_oNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_J6SVePoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J6SVefoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J6SVevoNEd6aXOd_1RF62g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J6SVdfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6SVdvoNEd6aXOd_1RF62g" x="-11" y="11" width="135" height="58"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_J6S8gPoNEd6aXOd_1RF62g" type="2002" element="_nLZIaUggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_J6S8g_oNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_J6S8hPoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_J6S8hfoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_J6S8hvoNEd6aXOd_1RF62g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_J6S8gfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J6S8gvoNEd6aXOd_1RF62g" x="-11" y="11" width="124" height="69"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_J6JLgfoNEd6aXOd_1RF62g"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSmd9rDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSmd97DFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLVeAEggEeClJJrVvqnbbg" name="Container without children p1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLZvc0ggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLZvdEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLZIaUggEeClJJrVvqnbbg" name="Container without children p4">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLZIakggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLZvcEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLZvcUggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLZvckggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLZIbkggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLaWgkggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLaWg0ggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_J56iAfoNEd6aXOd_1RF62g"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <ownedRepresentations xmi:type="diagram:DSemanticDiagram" xmi:id="_Zf70oPoNEd6aXOd_1RF62g" name="Type9 Raw Diagram">
-      <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67vecBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
-        <data xmi:type="notation:Diagram" xmi:id="_ZgMTUPoNEd6aXOd_1RF62g" type="Sirius" element="_Zf70oPoNEd6aXOd_1RF62g" measurementUnit="Pixel">
-          <children xmi:type="notation:Node" xmi:id="_ZgQkwPoNEd6aXOd_1RF62g" type="2002" element="_nLdZ0EggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_ZgQkw_oNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_ZgQkxPoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_ZgQkxfoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_ZgQkxvoNEd6aXOd_1RF62g"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_Zgkt0PoNEd6aXOd_1RF62g" type="3012" element="_nLfPA0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_ZglU4PoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_ZglU4foNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ZgoYMPoNEd6aXOd_1RF62g" type="3002" element="_nLfPBEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgoYMfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgoYMvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_Zgkt0foNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Ch7sPxdEd6fe5GJbtZ0sw" x="97" y="70" width="61" height="18"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ZglU4voNEd6aXOd_1RF62g" type="3012" element="_nLf2E0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_Zgl78PoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Zgl78foNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ZgpmUPoNEd6aXOd_1RF62g" type="3002" element="_nLf2FEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgpmUfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgpmUvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ZglU4_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Ch7sfxdEd6fe5GJbtZ0sw" x="66" y="70" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_Zgl78voNEd6aXOd_1RF62g" type="3012" element="_nLf2G0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_ZgmjAPoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgmjAfoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_Zgq0cPoNEd6aXOd_1RF62g" type="3002" element="_nLgdIEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_Zgq0cfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zgq0cvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_Zgl78_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Ch7svxdEd6fe5GJbtZ0sw" x="35" y="70" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ZgmjAvoNEd6aXOd_1RF62g" type="3012" element="_nLgdJ0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_ZgmjBfoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgmjBvoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ZgsCkPoNEd6aXOd_1RF62g" type="3002" element="_nLgdKEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgsCkfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgsCkvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgmjA_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CiiwPxdEd6fe5GJbtZ0sw" x="158" y="14" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ZgmjB_oNEd6aXOd_1RF62g" type="3012" element="_nLhEM0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_ZgnKEPoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgnKEfoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ZgtQsPoNEd6aXOd_1RF62g" type="3002" element="_nLhENEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgtQsfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zgt3wPoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgmjCPoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CiiwfxdEd6fe5GJbtZ0sw" x="87" y="-22" width="30" height="30"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ZgnKEvoNEd6aXOd_1RF62g" type="3012" element="_nLhEO0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_ZgnKFfoNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgnKFvoNEd6aXOd_1RF62g" y="5"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_ZgxiIPoNEd6aXOd_1RF62g" type="3002" element="_nLhrQEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgxiIfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgxiIvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgnKE_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CiiwvxdEd6fe5GJbtZ0sw" x="4" y="70" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgQkwfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgQkwvoNEd6aXOd_1RF62g" x="22" y="11" width="168" height="80"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_ZgRL0PoNEd6aXOd_1RF62g" type="2002" element="_nLeA4EggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_ZgRL0_oNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_ZgRL1PoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_ZgRL1foNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_ZgRL1voNEd6aXOd_1RF62g"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_Zg0lcPoNEd6aXOd_1RF62g" type="3012" element="_nLhrR0ggEeClJJrVvqnbbg">
-              <children xmi:type="notation:Node" xmi:id="_Zg0lc_oNEd6aXOd_1RF62g" type="5010">
-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Zg0ldPoNEd6aXOd_1RF62g" x="-79" y="7"/>
-              </children>
-              <children xmi:type="notation:Node" xmi:id="_Zg1zkPoNEd6aXOd_1RF62g" type="3002" element="_nLhrSEggEeClJJrVvqnbbg">
-                <styles xmi:type="notation:ShapeStyle" xmi:id="_Zg1zkfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zg1zkvoNEd6aXOd_1RF62g"/>
-              </children>
-              <styles xmi:type="notation:ShapeStyle" xmi:id="_Zg0lcfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CjJ0PxdEd6fe5GJbtZ0sw" x="-22" y="22" width="30" height="30"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgRL0foNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgRL0voNEd6aXOd_1RF62g" x="297" width="344" height="91"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_ZgRL1_oNEd6aXOd_1RF62g" type="2002" element="_nLen8EggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_ZgRL2voNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_ZgRy4PoNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_ZgRy4foNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_ZgRy4voNEd6aXOd_1RF62g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgRL2PoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgRL2foNEd6aXOd_1RF62g" x="22" y="11" width="87" height="58"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_ZgRy4_oNEd6aXOd_1RF62g" type="2002" element="_nLen-UggEeClJJrVvqnbbg">
-            <children xmi:type="notation:Node" xmi:id="_ZgRy5voNEd6aXOd_1RF62g" type="5006"/>
-            <children xmi:type="notation:Node" xmi:id="_ZgRy5_oNEd6aXOd_1RF62g" type="7001">
-              <styles xmi:type="notation:SortingStyle" xmi:id="_ZgRy6PoNEd6aXOd_1RF62g"/>
-              <styles xmi:type="notation:FilteringStyle" xmi:id="_ZgRy6foNEd6aXOd_1RF62g"/>
-            </children>
-            <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgRy5PoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgRy5foNEd6aXOd_1RF62g" x="22" y="7" width="113" height="69"/>
-          </children>
-          <styles xmi:type="notation:DiagramStyle" xmi:id="_ZgMTUfoNEd6aXOd_1RF62g"/>
-        </data>
-      </ownedAnnotationEntries>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLdZ0EggEeClJJrVvqnbbg" name="Container without children p1">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLfPA0ggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLfPBEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLf2EEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLf2EUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLf2EkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLf2E0ggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLf2FEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLf2GEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLf2GUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLf2GkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLf2G0ggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLgdIEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLgdJEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLgdJUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLgdJkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLgdJ0ggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLgdKEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLhEMEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLhEMUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLhEMkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLhEM0ggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLhENEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLhEOEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLhEOUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLhEOkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLhEO0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLhrQEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLhrREggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLhrRUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLhrRkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLdZ0UggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLdZ1kggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLdZ10ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLdZ2EggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLdZ1UggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLaWikggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLaWi0ggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLVeAUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLWFEUggEeClJJrVvqnbbg" name="Container without children p1-1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLa9k0ggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLa9lEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLeA4EggEeClJJrVvqnbbg" name="Container without children p2">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
-        <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLhrR0ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="NSEW">
-          <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-          <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
-          <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLhrSEggEeClJJrVvqnbbg">
-            <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLiSUEggEeClJJrVvqnbbg"/>
-            <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
-            <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLiSUUggEeClJJrVvqnbbg"/>
-            <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLiSUkggEeClJJrVvqnbbg" red="136" green="136" blue="136"/>
-          </ownedStyle>
-          <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
-        </ownedBorderedNodes>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLeA4UggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLeA5kggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLeA50ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLeA6EggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLeA5UggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLa9m0ggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLbkoEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLWFEkggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLWsIkggEeClJJrVvqnbbg" name="Container without children p1-2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-2"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLbkp0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLbkqEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLWsI0ggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLWsK0ggEeClJJrVvqnbbg" name="Container without children p1-3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1/p1-3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLWsLEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLXTM0ggEeClJJrVvqnbbg" name="Container without children p2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLXTNEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLXTPEggEeClJJrVvqnbbg" name="Container without children p2-1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLcLs0ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="EAST_WEST">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLcLtEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@borderedNodeMappings[name='DT8_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLX6QEggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLX6SEggEeClJJrVvqnbbg" name="Container without children p2-2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2/p2-2"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLX6SUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLZIYEggEeClJJrVvqnbbg" name="Container without children p3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLZIYUggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLZIaUggEeClJJrVvqnbbg" name="Container without children p4">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLZIakggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']/@containerMappings[name='DT8_Package']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType8']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_J56iAfoNEd6aXOd_1RF62g"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_Zf70oPoNEd6aXOd_1RF62g" name="Type9 Raw Diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_67vecBFQEeKQrpwaBKeVCA" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_ZgMTUPoNEd6aXOd_1RF62g" type="Sirius" element="_Zf70oPoNEd6aXOd_1RF62g" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_ZgQkwPoNEd6aXOd_1RF62g" type="2002" element="_nLdZ0EggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_ZgQkw_oNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_ZgQkxPoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ZgQkxfoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ZgQkxvoNEd6aXOd_1RF62g"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Zgkt0PoNEd6aXOd_1RF62g" type="3012" element="_nLfPA0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_ZglU4PoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_ZglU4foNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_ZgoYMPoNEd6aXOd_1RF62g" type="3002" element="_nLfPBEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgoYMfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgoYMvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_Zgkt0foNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Ch7sPxdEd6fe5GJbtZ0sw" x="97" y="70" width="61" height="18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ZglU4voNEd6aXOd_1RF62g" type="3012" element="_nLf2E0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_Zgl78PoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Zgl78foNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_ZgpmUPoNEd6aXOd_1RF62g" type="3002" element="_nLf2FEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgpmUfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgpmUvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ZglU4_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Ch7sfxdEd6fe5GJbtZ0sw" x="66" y="70" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Zgl78voNEd6aXOd_1RF62g" type="3012" element="_nLf2G0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_ZgmjAPoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgmjAfoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_Zgq0cPoNEd6aXOd_1RF62g" type="3002" element="_nLgdIEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_Zgq0cfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zgq0cvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_Zgl78_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Ch7svxdEd6fe5GJbtZ0sw" x="35" y="70" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ZgmjAvoNEd6aXOd_1RF62g" type="3012" element="_nLgdJ0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_ZgmjBfoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgmjBvoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_ZgsCkPoNEd6aXOd_1RF62g" type="3002" element="_nLgdKEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgsCkfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgsCkvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgmjA_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CiiwPxdEd6fe5GJbtZ0sw" x="158" y="14" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ZgmjB_oNEd6aXOd_1RF62g" type="3012" element="_nLhEM0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_ZgnKEPoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgnKEfoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_ZgtQsPoNEd6aXOd_1RF62g" type="3002" element="_nLhENEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgtQsfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zgt3wPoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgmjCPoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CiiwfxdEd6fe5GJbtZ0sw" x="87" y="-22" width="30" height="30"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ZgnKEvoNEd6aXOd_1RF62g" type="3012" element="_nLhEO0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_ZgnKFfoNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_ZgnKFvoNEd6aXOd_1RF62g" y="5"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_ZgxiIPoNEd6aXOd_1RF62g" type="3002" element="_nLhrQEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgxiIfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgxiIvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgnKE_oNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CiiwvxdEd6fe5GJbtZ0sw" x="4" y="70" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgQkwfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgQkwvoNEd6aXOd_1RF62g" x="22" y="11" width="168" height="80"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_ZgRL0PoNEd6aXOd_1RF62g" type="2002" element="_nLeA4EggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_ZgRL0_oNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_ZgRL1PoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ZgRL1foNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ZgRL1voNEd6aXOd_1RF62g"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Zg0lcPoNEd6aXOd_1RF62g" type="3012" element="_nLhrR0ggEeClJJrVvqnbbg">
+            <children xmi:type="notation:Node" xmi:id="_Zg0lc_oNEd6aXOd_1RF62g" type="5010">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Zg0ldPoNEd6aXOd_1RF62g" x="-79" y="7"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_Zg1zkPoNEd6aXOd_1RF62g" type="3002" element="_nLhrSEggEeClJJrVvqnbbg">
+              <styles xmi:type="notation:ShapeStyle" xmi:id="_Zg1zkfoNEd6aXOd_1RF62g" fontName="Segoe UI"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zg1zkvoNEd6aXOd_1RF62g"/>
+            </children>
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_Zg0lcfoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5CjJ0PxdEd6fe5GJbtZ0sw" x="-22" y="22" width="30" height="30"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgRL0foNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgRL0voNEd6aXOd_1RF62g" x="297" width="344" height="91"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_ZgRL1_oNEd6aXOd_1RF62g" type="2002" element="_nLen8EggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_ZgRL2voNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_ZgRy4PoNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ZgRy4foNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ZgRy4voNEd6aXOd_1RF62g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgRL2PoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgRL2foNEd6aXOd_1RF62g" x="22" y="11" width="87" height="58"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_ZgRy4_oNEd6aXOd_1RF62g" type="2002" element="_nLen-UggEeClJJrVvqnbbg">
+          <children xmi:type="notation:Node" xmi:id="_ZgRy5voNEd6aXOd_1RF62g" type="5006"/>
+          <children xmi:type="notation:Node" xmi:id="_ZgRy5_oNEd6aXOd_1RF62g" type="7001">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_ZgRy6PoNEd6aXOd_1RF62g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_ZgRy6foNEd6aXOd_1RF62g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ZgRy5PoNEd6aXOd_1RF62g" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZgRy5foNEd6aXOd_1RF62g" x="22" y="7" width="113" height="69"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_ZgMTUfoNEd6aXOd_1RF62g"/>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_RSnE8LDFEeanMtzDRncztA" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_RSnE8bDFEeanMtzDRncztA"/>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLdZ0EggEeClJJrVvqnbbg" name="Container without children p1">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p1"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLfPA0ggEeClJJrVvqnbbg" name="C1-1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLfPBEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLen8EggEeClJJrVvqnbbg" name="Container without children p3">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLen8UggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLen9kggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLen90ggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLen-EggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLen9UggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLf2E0ggEeClJJrVvqnbbg" name="C1-2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLf2FEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
-      </ownedDiagramElements>
-      <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLen-UggEeClJJrVvqnbbg" name="Container without children p4">
-        <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
-        <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLen-kggEeClJJrVvqnbbg">
-          <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_nLfPAEggEeClJJrVvqnbbg"/>
-          <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
-          <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_nLfPAUggEeClJJrVvqnbbg"/>
-          <backgroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLfPAkggEeClJJrVvqnbbg" red="255" green="255" blue="255"/>
-          <foregroundColor xmi:type="viewpoint:RGBValues" xmi:id="_nLen_kggEeClJJrVvqnbbg" red="209" green="209" blue="209"/>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLf2G0ggEeClJJrVvqnbbg" name="C1-3" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLgdIEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
         </ownedStyle>
-        <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
-      </ownedDiagramElements>
-      <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']"/>
-      <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_Zf70ofoNEd6aXOd_1RF62g"/>
-      <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
-    </ownedRepresentations>
-    <viewpoint xmi:type="description:Viewpoint" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']"/>
-  </ownedViews>
-</viewpoint:DAnalysis>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLgdJ0ggEeClJJrVvqnbbg" name="C1-1-1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLgdKEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLhEM0ggEeClJJrVvqnbbg" name="C1-1-2" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLhENEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLhEO0ggEeClJJrVvqnbbg" name="C1-2-1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLhrQEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLdZ0UggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLeA4EggEeClJJrVvqnbbg" name="Container without children p2">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p2"/>
+      <ownedBorderedNodes xmi:type="diagram:DNode" xmi:id="_nLhrR0ggEeClJJrVvqnbbg" name="new EClass 1" width="3" height="3" resizeKind="NSEW">
+        <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+        <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+        <ownedStyle xmi:type="diagram:Dot" xmi:id="_nLhrSEggEeClJJrVvqnbbg">
+          <description xmi:type="style:DotDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@borderedNodeMappings[name='DT9_Class']"/>
+      </ownedBorderedNodes>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLeA4UggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLen8EggEeClJJrVvqnbbg" name="Container without children p3">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p3"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLen8UggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_nLen-UggEeClJJrVvqnbbg" name="Container without children p4">
+      <target xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <semanticElements xmi:type="ecore:EPackage" href="My.ecore#//p4"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_nLen-kggEeClJJrVvqnbbg" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:FlatContainerStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']/@containerMappings[name='DT9_Package']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType9']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_Zf70ofoNEd6aXOd_1RF62g"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_ILG-0bDOEeaJB9-B3hmsRw" name="DiagType10 of MyPackage">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_ILG-0rDOEeaJB9-B3hmsRw" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_ILG-07DOEeaJB9-B3hmsRw"/>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_ILHl4LDOEeaJB9-B3hmsRw" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_ILHl4bDOEeaJB9-B3hmsRw" type="Sirius" element="_ILG-0bDOEeaJB9-B3hmsRw" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_ILHl47DOEeaJB9-B3hmsRw" type="2001" element="_ILG-1LDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_ILIM8LDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_ILIM8bDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILNsgLDOEeaJB9-B3hmsRw" type="3016" element="_ILG-2bDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ILNsgbDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILNsgrDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ILHl5LDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILHl5bDOEeaJB9-B3hmsRw" x="-38" y="270" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_ILI0ALDOEeaJB9-B3hmsRw" type="2001" element="_ILG-2rDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_ILI0A7DOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_ILI0BLDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILQv07DOEeaJB9-B3hmsRw" type="3016" element="_ILG-27DOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ILQv1LDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILQv1bDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ILI0AbDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILI0ArDOEeaJB9-B3hmsRw" x="-158" y="50" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_ILI0BbDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_ILG-3LDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_ILJbELDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_ILJbEbDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILRW4LDOEeaJB9-B3hmsRw" type="3016" element="_ILG-3bDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ILRW4bDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILRW4rDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ILI0BrDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILI0B7DOEeaJB9-B3hmsRw" x="4" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_ILJbErDOEeaJB9-B3hmsRw" type="2001" element="_ILG-3rDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_ILLQQLDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_ILLQQbDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILRW47DOEeaJB9-B3hmsRw" type="3016" element="_ILG-37DOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ILRW5LDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILRW5bDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ILJbE7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILJbFLDOEeaJB9-B3hmsRw" x="-38" y="50" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_ILL3ULDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_ILG-4LDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_ILL3U7DOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_ILL3VLDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILRW5rDOEeaJB9-B3hmsRw" type="3016" element="_ILG-4bDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ILRW57DOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILRW6LDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ILL3UbDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILL3UrDOEeaJB9-B3hmsRw" x="92" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_ILL3VbDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_ILG-4rDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_ILMeYLDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_ILMeYbDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILRW6bDOEeaJB9-B3hmsRw" type="3016" element="_ILG-47DOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ILRW6rDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILRW67DOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ILL3VrDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILL3V7DOEeaJB9-B3hmsRw" x="182" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_ILMeYrDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_ILG-5LDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_ILMeZbDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_ILMeZrDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILR98LDOEeaJB9-B3hmsRw" type="3016" element="_ILG-5bDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_ILR98bDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILR98rDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_ILMeY7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILMeZLDOEeaJB9-B3hmsRw" x="272" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_w-eDoLDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_w-bAULDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_w-eqsLDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_w-eqsbDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_w-gf5bDOEeaJB9-B3hmsRw" type="3017" element="_w-bnYLDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_w-gf5rDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-gf57DOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_w-eDobDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-eDorDOEeaJB9-B3hmsRw" x="-200" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_w-eqsrDOEeaJB9-B3hmsRw" type="2001" element="_w-bnYbDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_w-fRwLDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_w-fRwbDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_w-gf6LDOEeaJB9-B3hmsRw" type="3017" element="_w-bnYrDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_w-gf6bDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-gf6rDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_w-eqs7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-eqtLDOEeaJB9-B3hmsRw" x="90" y="60" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_w-fRwrDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_w-bnY7DOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_w-fRxbDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_w-fRxrDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_w-hG8LDOEeaJB9-B3hmsRw" type="3017" element="_w-bnZLDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_w-hG8bDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-hG8rDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_w-fRw7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-fRxLDOEeaJB9-B3hmsRw" x="-380" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_w-fRx7DOEeaJB9-B3hmsRw" visible="false" type="2001" element="_w-bnZbDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_w-f40LDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_w-f40bDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_w-hG87DOEeaJB9-B3hmsRw" type="3017" element="_w-cOcLDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_w-hG9LDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-hG9bDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_w-fRyLDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-fRybDOEeaJB9-B3hmsRw" x="-55" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_w-f40rDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_w-cOcbDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_w-f41bDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_w-f41rDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_w-hG9rDOEeaJB9-B3hmsRw" type="3017" element="_w-cOcrDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_w-hG97DOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-hG-LDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_w-f407DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-f41LDOEeaJB9-B3hmsRw" x="510" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_w-f417DOEeaJB9-B3hmsRw" visible="false" type="2001" element="_w-cOc7DOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_w-f42rDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_w-f427DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_w-hG-bDOEeaJB9-B3hmsRw" type="3017" element="_w-cOdLDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_w-hG-rDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-hG-7DOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_w-f42LDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-f42bDOEeaJB9-B3hmsRw" x="600" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_w-gf4LDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_w-cOdbDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_w-gf47DOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_w-gf5LDOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_w-hG_LDOEeaJB9-B3hmsRw" type="3017" element="_w-cOdrDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_w-hG_bDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-hG_rDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_w-gf4bDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-gf4rDOEeaJB9-B3hmsRw" x="690" width="30" height="30"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_ILHl4rDOEeaJB9-B3hmsRw"/>
+        <edges xmi:type="notation:Edge" xmi:id="_ILR987DOEeaJB9-B3hmsRw" type="4001" element="_ILG-5rDOEeaJB9-B3hmsRw" source="_ILHl47DOEeaJB9-B3hmsRw" target="_ILI0ALDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_ILSlALDOEeaJB9-B3hmsRw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILSlAbDOEeaJB9-B3hmsRw" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILSlArDOEeaJB9-B3hmsRw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILSlA7DOEeaJB9-B3hmsRw" x="5" y="9"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILSlBLDOEeaJB9-B3hmsRw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILSlBbDOEeaJB9-B3hmsRw" x="6" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ILR99LDOEeaJB9-B3hmsRw"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ILR99bDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ILR99rDOEeaJB9-B3hmsRw" points="[0, 0, 45, 60]$[-45, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ILSlBrDOEeaJB9-B3hmsRw" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ILSlB7DOEeaJB9-B3hmsRw" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_ILSlCLDOEeaJB9-B3hmsRw" type="4001" element="_ILG-6bDOEeaJB9-B3hmsRw" source="_ILHl47DOEeaJB9-B3hmsRw" target="_ILJbErDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_ILSlDLDOEeaJB9-B3hmsRw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILSlDbDOEeaJB9-B3hmsRw" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILSlDrDOEeaJB9-B3hmsRw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILSlD7DOEeaJB9-B3hmsRw" x="-6" y="8"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ILSlELDOEeaJB9-B3hmsRw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILSlEbDOEeaJB9-B3hmsRw" x="-5" y="8"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ILSlCbDOEeaJB9-B3hmsRw"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ILSlCrDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ILSlC7DOEeaJB9-B3hmsRw" points="[0, 0, -45, 60]$[45, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ILTMELDOEeaJB9-B3hmsRw" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ILTMEbDOEeaJB9-B3hmsRw" id="(0.5,1.0)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_ILG-1LDOEeaJB9-B3hmsRw" name="C1-1" outgoingEdges="_ILG-5rDOEeaJB9-B3hmsRw _ILG-6bDOEeaJB9-B3hmsRw" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ILG-2bDOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_ILG-2rDOEeaJB9-B3hmsRw" name="C1-2" incomingEdges="_ILG-5rDOEeaJB9-B3hmsRw" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ILG-27DOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_ILG-3LDOEeaJB9-B3hmsRw" name="C1-3" visible="false" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_0R6xYLDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ILG-3bDOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_ILG-3rDOEeaJB9-B3hmsRw" name="C1-1-1" incomingEdges="_ILG-6bDOEeaJB9-B3hmsRw" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ILG-37DOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_ILG-4LDOEeaJB9-B3hmsRw" name="C1-1-2" visible="false" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_0R7YcbDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ILG-4bDOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_ILG-4rDOEeaJB9-B3hmsRw" name="C1-2-1" visible="false" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_0R7YcLDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ILG-47DOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_ILG-5LDOEeaJB9-B3hmsRw" name="new EClass 1" visible="false" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_02uHkLDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ILG-5bDOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_ILG-5rDOEeaJB9-B3hmsRw" name="aC1-2" sourceNode="_ILG-1LDOEeaJB9-B3hmsRw" targetNode="_ILG-2rDOEeaJB9-B3hmsRw">
+      <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_ILG-57DOEeaJB9-B3hmsRw">
+        <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_ILG-6LDOEeaJB9-B3hmsRw" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_ILG-6bDOEeaJB9-B3hmsRw" name="aC1-1-1" sourceNode="_ILG-1LDOEeaJB9-B3hmsRw" targetNode="_ILG-3rDOEeaJB9-B3hmsRw">
+      <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
+      <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_ILG-6rDOEeaJB9-B3hmsRw">
+        <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_ILG-67DOEeaJB9-B3hmsRw" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_w-bAULDOEeaJB9-B3hmsRw" name="C1-1" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_y_36sbDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_w-bnYLDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_w-bnYbDOEeaJB9-B3hmsRw" name="C1-2" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_w-bnYrDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_w-bnY7DOEeaJB9-B3hmsRw" name="C1-3" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_5BwkoLDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_w-bnZLDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_w-bnZbDOEeaJB9-B3hmsRw" name="C1-1-1" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_y_36sLDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_w-cOcLDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_w-cOcbDOEeaJB9-B3hmsRw" name="C1-1-2" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_yM2iUbDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_w-cOcrDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_w-cOc7DOEeaJB9-B3hmsRw" name="C1-2-1" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_yM2iULDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_w-cOdLDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_w-cOdbDOEeaJB9-B3hmsRw" name="new EClass 1" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_yM17QLDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_w-cOdrDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_ILG-7LDOEeaJB9-B3hmsRw"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+  <diagram:DSemanticDiagram xmi:id="_73Nu0LDOEeaJB9-B3hmsRw" name="Type10 Raw Diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_73Nu0bDOEeaJB9-B3hmsRw" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_73Nu0rDOEeaJB9-B3hmsRw"/>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_73Nu07DOEeaJB9-B3hmsRw" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_73Nu1LDOEeaJB9-B3hmsRw" type="Sirius" element="_73Nu0LDOEeaJB9-B3hmsRw" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_73Nu1bDOEeaJB9-B3hmsRw" type="2001" element="_73NvXrDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73Nu1rDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73Nu17DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73Nu2LDOEeaJB9-B3hmsRw" type="3016" element="_73NvX7DOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73Nu2bDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73Nu2rDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73Nu27DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73Nu3LDOEeaJB9-B3hmsRw" x="250" y="275" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73Nu3bDOEeaJB9-B3hmsRw" type="2001" element="_73NvYLDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73Nu3rDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73Nu37DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73Nu4LDOEeaJB9-B3hmsRw" type="3016" element="_73NvYbDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73Nu4bDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73Nu4rDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73Nu47DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73Nu5LDOEeaJB9-B3hmsRw" x="35" y="81" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73Nu5bDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_73NvYrDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73Nu5rDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73Nu57DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73Nu6LDOEeaJB9-B3hmsRw" type="3016" element="_73NvZLDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73Nu6bDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73Nu6rDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73Nu67DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73Nu7LDOEeaJB9-B3hmsRw" x="4" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73Nu7bDOEeaJB9-B3hmsRw" type="2001" element="_73NvZbDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73Nu7rDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73Nu77DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73Nu8LDOEeaJB9-B3hmsRw" type="3016" element="_73NvZrDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73Nu8bDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73Nu8rDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73Nu87DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73Nu9LDOEeaJB9-B3hmsRw" x="160" y="110" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73Nu9bDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_73NvZ7DOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73Nu9rDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73Nu97DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73Nu-LDOEeaJB9-B3hmsRw" type="3016" element="_73NvabDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73Nu-bDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73Nu-rDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73Nu-7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73Nu_LDOEeaJB9-B3hmsRw" x="92" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73Nu_bDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_73NvarDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73Nu_rDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73Nu_7DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvALDOEeaJB9-B3hmsRw" type="3016" element="_73NvbLDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvAbDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvArDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvA7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvBLDOEeaJB9-B3hmsRw" x="182" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73NvBbDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_73NvbbDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73NvBrDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73NvB7DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvCLDOEeaJB9-B3hmsRw" type="3016" element="_73Nvb7DOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvCbDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvCrDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvC7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvDLDOEeaJB9-B3hmsRw" x="272" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73NvDbDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_73NvdrDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73NvDrDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73NvD7DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvELDOEeaJB9-B3hmsRw" type="3017" element="_73NveLDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvEbDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvErDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvE7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvFLDOEeaJB9-B3hmsRw" x="-200" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73NvFbDOEeaJB9-B3hmsRw" type="2001" element="_73NvebDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73NvFrDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73NvF7DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvGLDOEeaJB9-B3hmsRw" type="3017" element="_73NverDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvGbDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvGrDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvG7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvHLDOEeaJB9-B3hmsRw" x="440" y="185" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73NvHbDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_73Nve7DOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73NvHrDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73NvH7DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvILDOEeaJB9-B3hmsRw" type="3017" element="_73NvfbDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvIbDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvIrDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvI7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvJLDOEeaJB9-B3hmsRw" x="-380" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73NvJbDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_73NvfrDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73NvJrDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73NvJ7DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvKLDOEeaJB9-B3hmsRw" type="3017" element="_73NvgLDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvKbDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvKrDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvK7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvLLDOEeaJB9-B3hmsRw" x="-55" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73NvLbDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_73NvgbDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73NvLrDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73NvL7DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvMLDOEeaJB9-B3hmsRw" type="3017" element="_73Nvg7DOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvMbDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvMrDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvM7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvNLDOEeaJB9-B3hmsRw" x="510" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73NvNbDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_73NvhLDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73NvNrDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73NvN7DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvOLDOEeaJB9-B3hmsRw" type="3017" element="_73NvhrDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvObDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvOrDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvO7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvPLDOEeaJB9-B3hmsRw" x="600" width="30" height="30"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_73NvPbDOEeaJB9-B3hmsRw" visible="false" type="2001" element="_73Nvh7DOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73NvPrDOEeaJB9-B3hmsRw" type="5002">
+            <layoutConstraint xmi:type="notation:Location" xmi:id="_73NvP7DOEeaJB9-B3hmsRw" x="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvQLDOEeaJB9-B3hmsRw" type="3017" element="_73NvibDOEeaJB9-B3hmsRw">
+            <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvQbDOEeaJB9-B3hmsRw" fontName="Segoe UI"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvQrDOEeaJB9-B3hmsRw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_73NvQ7DOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvRLDOEeaJB9-B3hmsRw" x="690" width="30" height="30"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_73NvRbDOEeaJB9-B3hmsRw"/>
+        <edges xmi:type="notation:Edge" xmi:id="_73NvRrDOEeaJB9-B3hmsRw" type="4001" element="_73NvcLDOEeaJB9-B3hmsRw" source="_73Nu1bDOEeaJB9-B3hmsRw" target="_73Nu3bDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73NvR7DOEeaJB9-B3hmsRw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvSLDOEeaJB9-B3hmsRw" x="3" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvSbDOEeaJB9-B3hmsRw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvSrDOEeaJB9-B3hmsRw" x="4" y="-9"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvS7DOEeaJB9-B3hmsRw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvTLDOEeaJB9-B3hmsRw" x="-9" y="2"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_73NvTbDOEeaJB9-B3hmsRw"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_73NvTrDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_73NvT7DOEeaJB9-B3hmsRw" points="[-15, 6, 200, 170]$[-100, 40, 115, 204]$[-245, 0, -30, 164]$[-215, -164, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_73NvULDOEeaJB9-B3hmsRw" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_73NvUbDOEeaJB9-B3hmsRw" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_73NvUrDOEeaJB9-B3hmsRw" type="4001" element="_73Nvc7DOEeaJB9-B3hmsRw" source="_73Nu1bDOEeaJB9-B3hmsRw" target="_73Nu7bDOEeaJB9-B3hmsRw">
+          <children xmi:type="notation:Node" xmi:id="_73NvU7DOEeaJB9-B3hmsRw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvVLDOEeaJB9-B3hmsRw" x="6" y="-8"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvVbDOEeaJB9-B3hmsRw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvVrDOEeaJB9-B3hmsRw" x="-10" y="-3"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_73NvV7DOEeaJB9-B3hmsRw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_73NvWLDOEeaJB9-B3hmsRw" x="7" y="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_73NvWbDOEeaJB9-B3hmsRw"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_73NvWrDOEeaJB9-B3hmsRw" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_73NvW7DOEeaJB9-B3hmsRw" points="[0, 0, 90, 135]$[-20, -70, 70, 65]$[110, -160, 200, -25]$[-75, -137, 15, -2]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_73NvXLDOEeaJB9-B3hmsRw" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_73NvXbDOEeaJB9-B3hmsRw" id="(0.5,1.0)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvXrDOEeaJB9-B3hmsRw" name="C1-1" outgoingEdges="_73NvcLDOEeaJB9-B3hmsRw _73Nvc7DOEeaJB9-B3hmsRw" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_73NvX7DOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvYLDOEeaJB9-B3hmsRw" name="C1-2" incomingEdges="_73NvcLDOEeaJB9-B3hmsRw" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_73NvYbDOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1" color="200,136,136">
+        <customFeatures>color</customFeatures>
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvYrDOEeaJB9-B3hmsRw" name="C1-3" visible="false" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_73NvY7DOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_73NvZLDOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvZbDOEeaJB9-B3hmsRw" name="C1-1-1" incomingEdges="_73Nvc7DOEeaJB9-B3hmsRw" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_73NvZrDOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvZ7DOEeaJB9-B3hmsRw" name="C1-1-2" visible="false" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_73NvaLDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_73NvabDOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvarDOEeaJB9-B3hmsRw" name="C1-2-1" visible="false" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_73Nva7DOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_73NvbLDOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvbbDOEeaJB9-B3hmsRw" name="new EClass 1" visible="false" width="3" height="3" resizeKind="EAST_WEST">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_73NvbrDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_73Nvb7DOEeaJB9-B3hmsRw" borderSize="1" borderSizeComputationExpression="1">
+        <description xmi:type="style:EllipseNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_73NvcLDOEeaJB9-B3hmsRw" name="aC1-2" sourceNode="_73NvXrDOEeaJB9-B3hmsRw" targetNode="_73NvYLDOEeaJB9-B3hmsRw">
+      <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-2"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_73NvcbDOEeaJB9-B3hmsRw">
+        <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_73NvcrDOEeaJB9-B3hmsRw" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_73Nvc7DOEeaJB9-B3hmsRw" name="aC1-1-1" sourceNode="_73NvXrDOEeaJB9-B3hmsRw" targetNode="_73NvZbDOEeaJB9-B3hmsRw">
+      <target xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
+      <semanticElements xmi:type="ecore:EReference" href="My.ecore#//p1/C1-1/aC1-1-1"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_73NvdLDOEeaJB9-B3hmsRw">
+        <description xmi:type="style:EdgeStyleDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_73NvdbDOEeaJB9-B3hmsRw" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@edgeMappings[name='DT10_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvdrDOEeaJB9-B3hmsRw" name="C1-1" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-1"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_73Nvd7DOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_73NveLDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvebDOEeaJB9-B3hmsRw" name="C1-2" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-2"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_73NverDOEeaJB9-B3hmsRw" color="114,73,210">
+        <customFeatures>color</customFeatures>
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73Nve7DOEeaJB9-B3hmsRw" name="C1-3" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/C1-3"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_73NvfLDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_73NvfbDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvfrDOEeaJB9-B3hmsRw" name="C1-1-1" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-1"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_73Nvf7DOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_73NvgLDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvgbDOEeaJB9-B3hmsRw" name="C1-1-2" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-1/C1-1-2"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_73NvgrDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_73Nvg7DOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73NvhLDOEeaJB9-B3hmsRw" name="C1-2-1" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p1/p1-2/C1-2-1"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_73NvhbDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_73NvhrDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_73Nvh7DOEeaJB9-B3hmsRw" name="new EClass 1" visible="false" width="3" height="3" resizeKind="NSEW">
+      <target xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <semanticElements xmi:type="ecore:EClass" href="My.ecore#//p2/p2-1/new%20EClass%201"/>
+      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_73NviLDOEeaJB9-B3hmsRw"/>
+      <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_73NvibDOEeaJB9-B3hmsRw" color="114,73,110">
+        <description xmi:type="style:LozengeNodeDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:NodeMapping" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_2_Class']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="My.odesign#//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_73NvirDOEeaJB9-B3hmsRw"/>
+    <target xmi:type="ecore:EPackage" href="My.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign
index 0fef047353..8f122c6d20 100644
--- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign
+++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layout/data/My.odesign
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="MyGroup" version="10.0.0.201505222000">
+<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="MyGroup" version="11.1.1.201610211630">
   <ownedViewpoints name="TestLayoutCopy" modelFileExtension="ecore">
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType1" titleExpression="aql:'DiagType1 of ' + self.name" domainClass="EPackage">
       <edgeMappings name="DT1_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType1']/@containerMappings[name='DT1_Package']/@subNodeMappings[name='DT1_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
@@ -18,7 +18,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
         </subNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container ' + self.name">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'Container ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -51,14 +51,14 @@
               <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>
           </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
+          <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
           <conditionnalStyles predicateExpression="aql:self.abstract">
-            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
+            <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelFormat>italic</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -67,7 +67,7 @@
             </style>
           </conditionnalStyles>
         </subContainerMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelSize="10" labelExpression="aql:'Container ' + self.name" backgroundStyle="GradientTopToBottom">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:'Container ' + self.name" backgroundStyle="GradientTopToBottom">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -86,7 +86,7 @@
     </ownedRepresentations>
     <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType4" titleExpression="aql:'DiagType4 of ' + self.name" domainClass="EPackage">
       <containerMappings name="DT4_Package" semanticCandidatesExpression="feature:eContents" domainClass="EPackage">
-        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -136,7 +136,7 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -153,7 +153,7 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -170,7 +170,7 @@
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
           </style>
         </borderedNodeMappings>
-        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelExpression="aql:'Container without children ' + self.name">
+        <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'Container without children ' + self.name">
           <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
@@ -178,5 +178,29 @@
         </style>
       </containerMappings>
     </ownedRepresentations>
+    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagType10" titleExpression="aql:'DiagType10 of ' + self.name" domainClass="EPackage">
+      <nodeMappings name="DT10_Class" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass">
+        <style xsi:type="style:EllipseNodeDescription" borderSizeComputationExpression="1" resizeKind="EAST_WEST">
+          <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+        </style>
+      </nodeMappings>
+      <nodeMappings name="DT10_2_Class" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EClass">
+        <style xsi:type="style:LozengeNodeDescription" resizeKind="NSEW">
+          <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/>
+        </style>
+      </nodeMappings>
+      <edgeMappings name="DT10_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']" targetMapping="//@ownedViewpoints[name='TestLayoutCopy']/@ownedRepresentations[name='DiagType10']/@nodeMappings[name='DT10_Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true">
+        <style>
+          <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
+          <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name">
+            <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+        </style>
+      </edgeMappings>
+    </ownedRepresentations>
   </ownedViewpoints>
 </description:Group>
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractFormatHelperImplNodeFormatDataTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractFormatHelperImplNodeFormatDataTest.java
index 93d61e666c..5109128953 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractFormatHelperImplNodeFormatDataTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractFormatHelperImplNodeFormatDataTest.java
@@ -10,15 +10,16 @@
  *******************************************************************************/
 package org.eclipse.sirius.tests.unit.diagram.format.data;
 
-import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.sirius.diagram.formatdata.NodeFormatData;
 import org.eclipse.sirius.diagram.formatdata.tools.api.util.FormatHelper;
 import org.eclipse.sirius.diagram.formatdata.tools.api.util.configuration.ConfigurationFactory;
 
-import com.google.common.collect.Iterables;
-
 /**
  * Test class.
  * 
@@ -48,7 +49,7 @@ public abstract class AbstractFormatHelperImplNodeFormatDataTest extends Abstrac
      */
     @Override
     protected AbstractFormatHelperImplTest<NodeFormatData>.FormatDataWrapper createWrappedInstance(final NodeFormatData from) throws Exception {
-        final NodeFormatData nodeFormatData = (NodeFormatData) EcoreUtil.copy(from);
+        final NodeFormatData nodeFormatData = EcoreUtil.copy(from);
         return new NodeFormatDataWrapper(nodeFormatData);
     }
 
@@ -57,9 +58,12 @@ public abstract class AbstractFormatHelperImplNodeFormatDataTest extends Abstrac
      */
     @Override
     protected AbstractFormatHelperImplTest<NodeFormatData>.FormatDataWrapper createWrappedNotEqualInstance() throws Exception {
-        final Iterator<? extends NodeFormatData> iterator = getManager().getRootNodeFormatData().values().iterator();
-        iterator.next();
-        return new NodeFormatDataWrapper(iterator.next());
+        List<NodeFormatData> formatDataList = new ArrayList<NodeFormatData>();
+        Collection<Map<String, NodeFormatData>> rootFormatDataMap = getManager().getRootNodeFormatData().values();
+        for (Map<String, NodeFormatData> valueMap : rootFormatDataMap) {
+            formatDataList.addAll(valueMap.values());
+        }
+        return new NodeFormatDataWrapper(formatDataList.get(1));
     }
 
     /**
@@ -67,7 +71,12 @@ public abstract class AbstractFormatHelperImplNodeFormatDataTest extends Abstrac
      */
     @Override
     protected NodeFormatData getReferenceFormatData() {
-        return Iterables.get(getManager().getRootNodeFormatData().values(), getIndexOfReferenceFormatData());
+        Collection<Map<String, NodeFormatData>> rootFormatDataMap = getManager().getRootNodeFormatData().values();
+        List<NodeFormatData> formatDataList = new ArrayList<NodeFormatData>();
+        for (Map<String, NodeFormatData> valueMap : rootFormatDataMap) {
+            formatDataList.addAll(valueMap.values());
+        }
+        return formatDataList.get(getIndexOfReferenceFormatData());
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractSiriusFormatDataManagerForSemanticElementsTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractSiriusFormatDataManagerForSemanticElementsTest.java
index 32469a49ec..8f5e8d4045 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractSiriusFormatDataManagerForSemanticElementsTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/AbstractSiriusFormatDataManagerForSemanticElementsTest.java
@@ -11,10 +11,12 @@
 package org.eclipse.sirius.tests.unit.diagram.format.data;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -32,12 +34,15 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.formatdata.AbstractFormatData;
+import org.eclipse.sirius.diagram.formatdata.EdgeFormatData;
+import org.eclipse.sirius.diagram.formatdata.NodeFormatData;
 import org.eclipse.sirius.diagram.formatdata.tools.api.util.FormatHelper;
 import org.eclipse.sirius.diagram.formatdata.tools.api.util.FormatHelper.FormatDifference;
 import org.eclipse.sirius.diagram.formatdata.tools.api.util.configuration.Configuration;
 import org.eclipse.sirius.diagram.ui.tools.api.format.FormatDataHelper;
 import org.eclipse.sirius.diagram.ui.tools.api.format.FormatDataKey;
 import org.eclipse.sirius.diagram.ui.tools.internal.format.AdvancedSiriusFormatDataManager;
+import org.eclipse.sirius.diagram.ui.tools.internal.format.NodeFormatDataKey;
 import org.eclipse.sirius.diagram.ui.tools.internal.format.semantic.SiriusFormatDataManagerForSemanticElements;
 import org.eclipse.sirius.ecore.extender.tool.api.ModelUtils;
 import org.eclipse.sirius.tests.SiriusTestsPlugin;
@@ -170,7 +175,7 @@ public class AbstractSiriusFormatDataManagerForSemanticElementsTest extends Siri
 
     protected static final Representation REPRES_TYPE5 = new Representation("DiagType5", DIAG_TYPE5_MYPACKAGE);
 
-    protected static final Diagram DIAG_TYPE6_MYPACKAGE = new Diagram("DiagType6 of MyPackage", 7, 2);
+    protected static final Diagram DIAG_TYPE6_MYPACKAGE = new Diagram("DiagType6 of MyPackage", 9, 2);
 
     private static final Representation REPRES_TYPE6 = new Representation("DiagType6", DIAG_TYPE6_MYPACKAGE);
 
@@ -298,6 +303,44 @@ public class AbstractSiriusFormatDataManagerForSemanticElementsTest extends Siri
         return getAndOpenAllDiagrams(false);
     }
 
+    /**
+     * Returns a list of all {@link NodeFormatData} contained by the given map
+     * 
+     * @param nodeFormatMap
+     *            the map from which we want to extract all
+     *            {@link NodeFormatData}.
+     * @return a list of all {@link NodeFormatData} contained by the given map.
+     *         An empty list if no such element exists.
+     */
+    protected List<NodeFormatData> getNodeFormatDataList(Map<? extends FormatDataKey, Map<String, NodeFormatData>> nodeFormatMap) {
+        List<NodeFormatData> formatDataList = new ArrayList<NodeFormatData>();
+        Collection<Map<String, NodeFormatData>> formatDataMap = nodeFormatMap.values();
+        for (Map<String, NodeFormatData> valueMap : formatDataMap) {
+            formatDataList.addAll(valueMap.values());
+        }
+        return formatDataList;
+
+    }
+
+    /**
+     * Returns a list of all {@link EdgeFormatData} contained by the given map
+     * 
+     * @param edgeFormatMap
+     *            the map from which we want to extract all
+     *            {@link EdgeFormatData}.
+     * @return a list of all {@link EdgeFormatData} contained by the given map.
+     *         An empty list if no such element exists.
+     */
+    protected List<EdgeFormatData> getEdgeFormatDataList(Map<? extends FormatDataKey, Map<String, EdgeFormatData>> edgeFormatMap) {
+        List<EdgeFormatData> formatDataList = new ArrayList<EdgeFormatData>();
+        Collection<Map<String, EdgeFormatData>> formatDataMap = edgeFormatMap.values();
+        for (Map<String, EdgeFormatData> valueMap : formatDataMap) {
+            formatDataList.addAll(valueMap.values());
+        }
+        return formatDataList;
+
+    }
+
     protected List<Diagram> getAndOpenAllDiagrams(boolean rawFiltered) {
         final List<Diagram> result = Lists.newArrayList();
         for (final Representation representation : ALL_REPRESENTATIONS) {
@@ -347,26 +390,34 @@ public class AbstractSiriusFormatDataManagerForSemanticElementsTest extends Siri
         }
 
         // Sort elements, SemanticNodeFormatDataKey are comparable
-        final Map<FormatDataKey, AbstractFormatData> rootNodeFormatData = new TreeMap<FormatDataKey, AbstractFormatData>(newManager.getRootNodeFormatData());
+        TreeMap<NodeFormatDataKey, Map<String, NodeFormatData>> rootNodeFormatDataMap = new TreeMap<NodeFormatDataKey, Map<String, NodeFormatData>>(newManager.getRootNodeFormatData());
+
+        List<NodeFormatData> nodeFormatDataList = getNodeFormatDataList(rootNodeFormatDataMap);
 
         // Compare results
-        final FormatDifference<?> difference = FormatHelper.INSTANCE.computeFirstFormatDifference(expected.values(), rootNodeFormatData.values(), configuration);
+        final FormatDifference<?> difference = FormatHelper.INSTANCE.computeFirstFormatDifference(expected.values(), nodeFormatDataList, configuration);
         return difference;
     }
 
     // Let this "unused" method, as it can be enabled to save diagram format
     // data
     // Data will be saved in org.eclipse.sirius.tests project folder
-    protected void saveDiagram(final Diagram diagram, final Collection<? extends AbstractFormatData> formatData) throws IOException {
+    protected void saveDiagram(final Diagram diagram, final Collection<Map<String, NodeFormatData>> formatData) throws IOException {
         final String pathName = getPlatformRelatedXmiDataPath() + encodeDiagramName(diagram) + XMI_EXTENSION;
         saveDiagram(formatData, pathName);
     }
 
-    protected void saveDiagram(final Collection<? extends AbstractFormatData> formatData, final String path) throws IOException {
+    protected void saveDiagram(final Collection<Map<String, NodeFormatData>> formatData, final String path) throws IOException {
         final ResourceSet resourceSet = new ResourceSetImpl();
         final URI uri = URI.createFileURI(path);
         final Resource resource = ModelUtils.createResource(uri, resourceSet);
-        resource.getContents().addAll(formatData);
+        Iterator<Map<String, NodeFormatData>> formatDataIterator = formatData.iterator();
+        while (formatDataIterator.hasNext()) {
+            Map<String, NodeFormatData> formatDataMap = formatDataIterator.next();
+            resource.getContents().addAll(formatDataMap.values());
+
+        }
+
         resource.save(Collections.EMPTY_MAP);
     }
 
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/FormatHelperImplEdgeFormatDataTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/FormatHelperImplEdgeFormatDataTest.java
index 7cc3c39a87..876012189c 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/FormatHelperImplEdgeFormatDataTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/FormatHelperImplEdgeFormatDataTest.java
@@ -10,7 +10,10 @@
  *******************************************************************************/
 package org.eclipse.sirius.tests.unit.diagram.format.data;
 
-import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.sirius.diagram.formatdata.EdgeFormatData;
@@ -55,9 +58,12 @@ public class FormatHelperImplEdgeFormatDataTest extends AbstractFormatHelperImpl
      */
     @Override
     protected AbstractFormatHelperImplTest<EdgeFormatData>.FormatDataWrapper createWrappedNotEqualInstance() throws Exception {
-        final Iterator<EdgeFormatData> iterator = getManager().getEdgeFormatData().values().iterator();
-        iterator.next();
-        return new EdgeFormatDataWrapper(iterator.next());
+        List<EdgeFormatData> formatDataList = new ArrayList<EdgeFormatData>();
+        Collection<Map<String, EdgeFormatData>> formatDataMap = getManager().getEdgeFormatData().values();
+        for (Map<String, EdgeFormatData> valueMap : formatDataMap) {
+            formatDataList.addAll(valueMap.values());
+        }
+        return new EdgeFormatDataWrapper(formatDataList.get(1));
     }
 
     /**
@@ -65,7 +71,12 @@ public class FormatHelperImplEdgeFormatDataTest extends AbstractFormatHelperImpl
      */
     @Override
     protected EdgeFormatData getReferenceFormatData() {
-        return getManager().getEdgeFormatData().values().iterator().next();
+        List<EdgeFormatData> formatDataList = new ArrayList<EdgeFormatData>();
+        Collection<Map<String, EdgeFormatData>> formatDataMap = getManager().getEdgeFormatData().values();
+        for (Map<String, EdgeFormatData> valueMap : formatDataMap) {
+            formatDataList.addAll(valueMap.values());
+        }
+        return formatDataList.get(0);
     }
 
 }
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/SiriusFormatDataManagerForDDiagramElementWithSameSemanticElementsTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/SiriusFormatDataManagerForDDiagramElementWithSameSemanticElementsTest.java
index 10bdb25408..2298f58d1e 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/SiriusFormatDataManagerForDDiagramElementWithSameSemanticElementsTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/SiriusFormatDataManagerForDDiagramElementWithSameSemanticElementsTest.java
@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.tests.unit.diagram.format.data;
 
+import java.util.Collection;
 import java.util.Map;
-import java.util.Map.Entry;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.draw2d.geometry.Rectangle;
@@ -25,7 +25,7 @@ import org.eclipse.sirius.diagram.ui.edit.api.part.IAbstractDiagramNodeEditPart;
 import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramContainerEditPart;
 import org.eclipse.sirius.diagram.ui.internal.edit.parts.AbstractDNodeContainerCompartmentEditPart;
 import org.eclipse.sirius.diagram.ui.tools.internal.editor.DDiagramEditorImpl;
-import org.eclipse.sirius.diagram.ui.tools.internal.format.semantic.SemanticNodeFormatDataKey;
+import org.eclipse.sirius.diagram.ui.tools.internal.format.NodeFormatDataKey;
 import org.eclipse.sirius.diagram.ui.tools.internal.format.semantic.SiriusFormatDataManagerForSemanticElements;
 import org.eclipse.sirius.tests.SiriusTestsPlugin;
 import org.eclipse.sirius.tests.support.api.SiriusDiagramTestCase;
@@ -123,18 +123,21 @@ public class SiriusFormatDataManagerForDDiagramElementWithSameSemanticElementsTe
         // Store the format data (copy format) and get the stored values.
         SiriusFormatDataManagerForSemanticElements mgr = new SiriusFormatDataManagerForSemanticElements();
         mgr.storeFormatData(idep);
-        Map<SemanticNodeFormatDataKey, NodeFormatData> data = mgr.getNodeFormatData();
+        Map<? extends NodeFormatDataKey, Map<String, NodeFormatData>> data = mgr.getNodeFormatData();
 
         // Check the stored data
         assertEquals("There should be only one top level format data", 1, data.size());
+        Collection<Map<String, NodeFormatData>> formatDataValues = data.values();
+        assertEquals("There should be only one top level format data", 1, formatDataValues.size());
 
-        Entry<SemanticNodeFormatDataKey, NodeFormatData> entry = data.entrySet().iterator().next();
-        assertEquals("There format data do not corresponds to the common semantic target", EcoreUtil.getURI(idep.resolveTargetSemanticElement()).fragment(), entry.getKey().getId());
+        NodeFormatDataKey formatDataKey = data.entrySet().iterator().next().getKey();
+        assertEquals("There format data do not corresponds to the common semantic target", EcoreUtil.getURI(idep.resolveTargetSemanticElement()).fragment(), formatDataKey.getId());
 
         // With wrong behavior, the hierarchy was not respected, there was no
         // second level data and the recorded data was the small size.
 
-        NodeFormatData l1Data = entry.getValue();
+        Map<String, NodeFormatData> formatDataMap = formatDataValues.iterator().next();
+        NodeFormatData l1Data = formatDataMap.entrySet().iterator().next().getValue();
         assertEquals(WRONG_TESTS_DATA, l1Bounds.height, l1Data.getHeight());
         assertEquals(WRONG_TESTS_DATA, l1Bounds.width, l1Data.getWidth());
 
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/SiriusFormatDataManagerForSemanticElementsTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/SiriusFormatDataManagerForSemanticElementsTest.java
index 8cd22e04ea..3d2e0bbf3a 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/SiriusFormatDataManagerForSemanticElementsTest.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/format/data/SiriusFormatDataManagerForSemanticElementsTest.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.tests.unit.diagram.format.data;
 
-import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
@@ -21,8 +21,6 @@ import org.eclipse.sirius.diagram.formatdata.NodeFormatData;
 import org.eclipse.sirius.diagram.formatdata.tools.api.util.FormatHelper;
 import org.eclipse.sirius.diagram.formatdata.tools.api.util.configuration.ConfigurationFactory;
 import org.eclipse.sirius.diagram.ui.tools.internal.format.AdvancedSiriusFormatDataManager;
-import org.eclipse.sirius.diagram.ui.tools.internal.format.EdgeFormatDataKey;
-import org.eclipse.sirius.diagram.ui.tools.internal.format.NodeFormatDataKey;
 import org.eclipse.sirius.diagram.ui.tools.internal.format.semantic.SemanticEdgeFormatDataKey;
 import org.eclipse.sirius.diagram.ui.tools.internal.format.semantic.SemanticNodeFormatDataKey;
 import org.eclipse.sirius.diagram.ui.tools.internal.format.semantic.SiriusFormatDataManagerForSemanticElements;
@@ -70,8 +68,8 @@ public class SiriusFormatDataManagerForSemanticElementsTest extends AbstractSiri
             final AdvancedSiriusFormatDataManager manager = new SiriusFormatDataManagerForSemanticElements();
             manager.storeFormatData(diagram);
 
-            final Map<? extends NodeFormatDataKey, NodeFormatData> nodeFormatData = manager.getNodeFormatData();
-            final Map<? extends EdgeFormatDataKey, EdgeFormatData> edgeFormatData = manager.getEdgeFormatData();
+            final List<NodeFormatData> nodeFormatData = getNodeFormatDataList(manager.getNodeFormatData());
+            final List<EdgeFormatData> edgeFormatData = getEdgeFormatDataList(manager.getEdgeFormatData());
 
             assertEquals("Number of expected node format data is wrong for diagram " + diag.name, diag.numberOfNodeFormatData, nodeFormatData.size());
             assertEquals("Number of expected edge format data is wrong for diagram " + diag.name, diag.numberOfEdgeFormatData, edgeFormatData.size());
@@ -90,20 +88,18 @@ public class SiriusFormatDataManagerForSemanticElementsTest extends AbstractSiri
 
             final AdvancedSiriusFormatDataManager manager = new SiriusFormatDataManagerForSemanticElements();
             manager.storeFormatData(diagramEditPart);
-            final Collection<? extends NodeFormatData> firstNodeValues = manager.getRootNodeFormatData().values();
-            final Collection<EdgeFormatData> firstEdgeValues = manager.getEdgeFormatData().values();
-
+            List<NodeFormatData> firstNodeFormat = getNodeFormatDataList(manager.getRootNodeFormatData());
+            List<EdgeFormatData> firstEdgeFormat = getEdgeFormatDataList(manager.getEdgeFormatData());
             for (int i = 0; i < ITERATIONS; i++) {
                 final AdvancedSiriusFormatDataManager otherManager = new SiriusFormatDataManagerForSemanticElements();
                 otherManager.storeFormatData(diagramEditPart);
-                final Collection<? extends NodeFormatData> secondNodeValues = otherManager.getRootNodeFormatData().values();
-                final Collection<EdgeFormatData> secondEdgeValues = otherManager.getEdgeFormatData().values();
 
-                final boolean haveSameFormat = FormatHelper.INSTANCE.haveSameLayout(firstNodeValues, secondNodeValues, ConfigurationFactory.buildConfiguration());
+                final boolean haveSameFormat = FormatHelper.INSTANCE.haveSameLayout(firstNodeFormat, getNodeFormatDataList(otherManager.getRootNodeFormatData()),
+                        ConfigurationFactory.buildConfiguration());
                 assertTrue("All node formats should be the same for diagram " + diag.name, haveSameFormat);
 
                 assertTrue("All edge formats should be the same for diagram " + diag.name,
-                        FormatHelper.INSTANCE.haveSameLayout(firstEdgeValues, secondEdgeValues, ConfigurationFactory.buildConfiguration()));
+                        FormatHelper.INSTANCE.haveSameLayout(firstEdgeFormat, getEdgeFormatDataList(otherManager.getEdgeFormatData()), ConfigurationFactory.buildConfiguration()));
             }
         }
     }
@@ -128,8 +124,9 @@ public class SiriusFormatDataManagerForSemanticElementsTest extends AbstractSiri
         assertTrue("Manager should contain data for diagram " + DIAG_TYPE2_MYPACKAGE.name, manager.containsData());
 
         final SemanticNodeFormatDataKey dataKey = new SemanticNodeFormatDataKey(element.getTarget());
-        final NodeFormatData nodeFormatData = manager.getNodeFormatData().get(dataKey);
+        final Map<String, NodeFormatData> nodeFormatDataMap = manager.getNodeFormatData().get(dataKey);
 
+        NodeFormatData nodeFormatData = nodeFormatDataMap.values().iterator().next();
         assertEquals("Wrong width", 653, nodeFormatData.getWidth());
         assertEquals("Wrong height", 173, nodeFormatData.getHeight());
 
@@ -158,8 +155,10 @@ public class SiriusFormatDataManagerForSemanticElementsTest extends AbstractSiri
         assertTrue("Manager should contain data for diagram " + DIAG_TYPE2_MYPACKAGE.name, manager.containsData());
 
         final SemanticEdgeFormatDataKey dataKey = new SemanticEdgeFormatDataKey(element.getTarget());
-        final EdgeFormatData edgeFormatData = manager.getEdgeFormatData().get(dataKey);
 
-        assertEquals("Wrong point list", 4, edgeFormatData.getPointList().size());
+        getEdgeFormatDataList(manager.getEdgeFormatData());
+        final Map<String, EdgeFormatData> edgeFormatData = manager.getEdgeFormatData().get(dataKey);
+
+        assertEquals("Wrong point list", 4, edgeFormatData.values().iterator().next().getPointList().size());
     }
 }