From 3e7fdbf562bbb1739a6ff4b09f86f415aaf89a56 Mon Sep 17 00:00:00 2001
From: OszkarSemerath <semerath@mit.bme.hu>
Date: Sat, 4 May 2019 15:31:47 -0400
Subject: Added aggregate expressions to logic language on the model level

---
 .../model/logiclanguage.aird                       | 4181 +++++++++++---------
 1 file changed, 2368 insertions(+), 1813 deletions(-)

(limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird')

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird
index 2a817e82..5673d66a 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="_VrVKcDx1EeWiQ_wtFd6fGQ" selectedViews="_WD40YDx1EeWiQ_wtFd6fGQ _WEG20Dx1EeWiQ_wtFd6fGQ _WEIE8Dx1EeWiQ_wtFd6fGQ _WEOLkDx1EeWiQ_wtFd6fGQ" version="12.1.0.201708031200">
+  <viewpoint:DAnalysis uid="_VrVKcDx1EeWiQ_wtFd6fGQ" selectedViews="_WD40YDx1EeWiQ_wtFd6fGQ _WEG20Dx1EeWiQ_wtFd6fGQ _WEIE8Dx1EeWiQ_wtFd6fGQ _WEOLkDx1EeWiQ_wtFd6fGQ" version="14.1.0.201810161215">
     <semanticResources>logiclanguage.ecore</semanticResources>
     <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
     <semanticResources>logicproblem.ecore</semanticResources>
     <semanticResources>logicresult.ecore</semanticResources>
-    <ownedViews xmi:type="viewpoint:DView" xmi:id="_WD40YDx1EeWiQ_wtFd6fGQ">
+    <ownedViews xmi:type="viewpoint:DView" uid="_WD40YDx1EeWiQ_wtFd6fGQ">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_xO0WUHt9EeeCn_RNMwgEBg" name="All elements" repPath="#_TBG5QG7rEeifqZoaQeIEkw">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_xO0WUHt9EeeCn_RNMwgEBg" name="All elements" repPath="#_XL9PsDx1EeWiQ_wtFd6fGQ">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="logiclanguage.ecore#/"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_xO0WUXt9EeeCn_RNMwgEBg" name="logicproblem class diagram" repPath="#_TC2lsG7rEeifqZoaQeIEkw">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_xO0WUXt9EeeCn_RNMwgEBg" name="logicproblem class diagram" repPath="#_veq9MGCGEeWg-_mfCA72gg">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="logicproblem.ecore#/"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_xO0WUnt9EeeCn_RNMwgEBg" name="Types and Type References" repPath="#_TDHEYG7rEeifqZoaQeIEkw">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_xO0WUnt9EeeCn_RNMwgEBg" name="Types and Type References" repPath="#_v6LzUIApEeW6pe97ikalXw">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="logiclanguage.ecore#/"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_xO09YHt9EeeCn_RNMwgEBg" name="Constants, Functions and Relations" repPath="#_TDSDgG7rEeifqZoaQeIEkw">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_xO09YHt9EeeCn_RNMwgEBg" name="Constants, Functions and Relations" repPath="#_FSREgIP2EeWOre-0TMCmMQ">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="logiclanguage.ecore#/"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_xO09YXt9EeeCn_RNMwgEBg" name="LogicResult" repPath="#_TDxLsG7rEeifqZoaQeIEkw">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_xO09YXt9EeeCn_RNMwgEBg" name="LogicResult" repPath="#_LobkUAJFEea4lsNl5Yuy6Q">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="logiclanguage.ecore#/"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_xO09Ynt9EeeCn_RNMwgEBg" name="Terms" repPath="#_TD8K0G7rEeifqZoaQeIEkw">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_xO09Ynt9EeeCn_RNMwgEBg" name="Terms" repPath="#_l6XRgLdnEeau1vMV3Bsx4w">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="logiclanguage.ecore#/"/>
       </ownedRepresentationDescriptors>
     </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" xmi:id="_WEG20Dx1EeWiQ_wtFd6fGQ">
+    <ownedViews xmi:type="viewpoint:DView" uid="_WEG20Dx1EeWiQ_wtFd6fGQ">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>
     </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" xmi:id="_WEIE8Dx1EeWiQ_wtFd6fGQ">
+    <ownedViews xmi:type="viewpoint:DView" uid="_WEIE8Dx1EeWiQ_wtFd6fGQ">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>
     </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" xmi:id="_WEOLkDx1EeWiQ_wtFd6fGQ">
+    <ownedViews xmi:type="viewpoint:DView" uid="_WEOLkDx1EeWiQ_wtFd6fGQ">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>
     </ownedViews>
   </viewpoint:DAnalysis>
-  <diagram:DSemanticDiagram xmi:id="_XL9PsDx1EeWiQ_wtFd6fGQ" name="All elements" uid="_TBG5QG7rEeifqZoaQeIEkw">
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_XL9PsTx1EeWiQ_wtFd6fGQ" source="DANNOTATION_CUSTOMIZATION_KEY">
-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_XL9Psjx1EeWiQ_wtFd6fGQ">
+  <diagram:DSemanticDiagram uid="_XL9PsDx1EeWiQ_wtFd6fGQ" name="All elements">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_XL9PsTx1EeWiQ_wtFd6fGQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_XL9Psjx1EeWiQ_wtFd6fGQ">
         <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_bcoasDx1EeWiQ_wtFd6fGQ" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
           <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelFormat>bold</labelFormat>
@@ -83,7 +83,7 @@
         </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_XMn-EDx1EeWiQ_wtFd6fGQ" source="GMF_DIAGRAMS">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_XMn-EDx1EeWiQ_wtFd6fGQ" source="GMF_DIAGRAMS">
       <data xmi:type="notation:Diagram" xmi:id="_XMolIDx1EeWiQ_wtFd6fGQ" type="Sirius" element="_XL9PsDx1EeWiQ_wtFd6fGQ" measurementUnit="Pixel">
         <children xmi:type="notation:Node" xmi:id="_be9V8Dx1EeWiQ_wtFd6fGQ" type="2003" element="_bZ1lYDx1EeWiQ_wtFd6fGQ">
           <children xmi:type="notation:Node" xmi:id="_be_LIDx1EeWiQ_wtFd6fGQ" type="5007"/>
@@ -2138,1766 +2138,1766 @@
         </edges>
       </data>
     </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bZ1lYDx1EeWiQ_wtFd6fGQ" name="Type" tooltipText="" outgoingEdges="_beBh0Dx1EeWiQ_wtFd6fGQ _OLE8QIPKEeWOre-0TMCmMQ" incomingEdges="_bdQs0Dx1EeWiQ_wtFd6fGQ _beElIDx1EeWiQ_wtFd6fGQ _agR7AGPkEeWuQbyserbs4Q _OLE8QIPKEeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bZ1lYDx1EeWiQ_wtFd6fGQ" name="Type" tooltipText="" outgoingEdges="_beBh0Dx1EeWiQ_wtFd6fGQ _OLE8QIPKEeWOre-0TMCmMQ" incomingEdges="_bdQs0Dx1EeWiQ_wtFd6fGQ _beElIDx1EeWiQ_wtFd6fGQ _agR7AGPkEeWuQbyserbs4Q _OLE8QIPKEeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Type"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Type"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_5YFD4IPIEeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_5YFD4IPIEeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bcl-cDx1EeWiQ_wtFd6fGQ" name="name : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_bcl-cDx1EeWiQ_wtFd6fGQ" name="name : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/name"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bcsFEDx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT" description="_bcoasDx1EeWiQ_wtFd6fGQ">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_bcsFEDx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT" description="_bcoasDx1EeWiQ_wtFd6fGQ">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_ODWbwAGOEeaDEJmvhpl9gg" name="isAbstract : EBoolean = false" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ODWbwAGOEeaDEJmvhpl9gg" name="isAbstract : EBoolean = false" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/isAbstract"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/isAbstract"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ODXC0AGOEeaDEJmvhpl9gg" labelAlignment="LEFT" description="_bcoasDx1EeWiQ_wtFd6fGQ">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_ODXC0AGOEeaDEJmvhpl9gg" labelAlignment="LEFT" description="_bcoasDx1EeWiQ_wtFd6fGQ">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_baDn0Dx1EeWiQ_wtFd6fGQ" name="DefinedElement" tooltipText="" outgoingEdges="_beDXADx1EeWiQ_wtFd6fGQ _OEz0UAGOEeaDEJmvhpl9gg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_baDn0Dx1EeWiQ_wtFd6fGQ" name="DefinedElement" tooltipText="" outgoingEdges="_beDXADx1EeWiQ_wtFd6fGQ _OEz0UAGOEeaDEJmvhpl9gg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_baE18Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_baE18Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_baGEEDx1EeWiQ_wtFd6fGQ" name="TypeDefinition" tooltipText="" outgoingEdges="_beElIDx1EeWiQ_wtFd6fGQ _dBnPUGPkEeWuQbyserbs4Q" incomingEdges="_OEz0UAGOEeaDEJmvhpl9gg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_baGEEDx1EeWiQ_wtFd6fGQ" name="TypeDefinition" tooltipText="" outgoingEdges="_beElIDx1EeWiQ_wtFd6fGQ _dBnPUGPkEeWuQbyserbs4Q" incomingEdges="_OEz0UAGOEeaDEJmvhpl9gg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDefinition"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDefinition"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_baGrIDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_baGrIDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_baKVgDx1EeWiQ_wtFd6fGQ" name="TypeReference" tooltipText="" outgoingEdges="_beGaUDx1EeWiQ_wtFd6fGQ" incomingEdges="_bdRT4Dx1EeWiQ_wtFd6fGQ _bdTJEDx1EeWiQ_wtFd6fGQ _bdXagDx1EeWiQ_wtFd6fGQ _bd8pUzx1EeWiQ_wtFd6fGQ _bd-egDx1EeWiQ_wtFd6fGQ _beHBYDx1EeWiQ_wtFd6fGQ _beHoczx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_baKVgDx1EeWiQ_wtFd6fGQ" name="TypeReference" tooltipText="" outgoingEdges="_beGaUDx1EeWiQ_wtFd6fGQ" incomingEdges="_bdRT4Dx1EeWiQ_wtFd6fGQ _bdTJEDx1EeWiQ_wtFd6fGQ _bdXagDx1EeWiQ_wtFd6fGQ _bd8pUzx1EeWiQ_wtFd6fGQ _bd-egDx1EeWiQ_wtFd6fGQ _beHBYDx1EeWiQ_wtFd6fGQ _beHoczx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_baLjoDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_baLjoDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_baMxwDx1EeWiQ_wtFd6fGQ" name="ComplexTypeReference" tooltipText="" outgoingEdges="_bdQs0Dx1EeWiQ_wtFd6fGQ _beHBYDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_baMxwDx1EeWiQ_wtFd6fGQ" name="ComplexTypeReference" tooltipText="" outgoingEdges="_bdQs0Dx1EeWiQ_wtFd6fGQ _beHBYDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ComplexTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ComplexTypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_baNY0Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_baNY0Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_baPOADx1EeWiQ_wtFd6fGQ" name="PrimitiveTypeReference" tooltipText="" outgoingEdges="_beHoczx1EeWiQ_wtFd6fGQ" incomingEdges="_beIPgzx1EeWiQ_wtFd6fGQ _beJdoDx1EeWiQ_wtFd6fGQ _beKrwDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_baPOADx1EeWiQ_wtFd6fGQ" name="PrimitiveTypeReference" tooltipText="" outgoingEdges="_beHoczx1EeWiQ_wtFd6fGQ" incomingEdges="_beIPgzx1EeWiQ_wtFd6fGQ _beJdoDx1EeWiQ_wtFd6fGQ _beKrwDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveTypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_baP1EDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_baP1EDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_baRDMDx1EeWiQ_wtFd6fGQ" name="IntTypeReference" tooltipText="" outgoingEdges="_beIPgzx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_baRDMDx1EeWiQ_wtFd6fGQ" name="IntTypeReference" tooltipText="" outgoingEdges="_beIPgzx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntTypeReference"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_baRqQDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_baRqQDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_baYX8Dx1EeWiQ_wtFd6fGQ" name="BoolTypeReference" tooltipText="" outgoingEdges="_beJdoDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_baYX8Dx1EeWiQ_wtFd6fGQ" name="BoolTypeReference" tooltipText="" outgoingEdges="_beJdoDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolTypeReference"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_baZmEDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_baZmEDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_baa0MDx1EeWiQ_wtFd6fGQ" name="RealTypeReference" tooltipText="" outgoingEdges="_beKrwDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_baa0MDx1EeWiQ_wtFd6fGQ" name="RealTypeReference" tooltipText="" outgoingEdges="_beKrwDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealTypeReference"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bacCUDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bacCUDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_badQcDx1EeWiQ_wtFd6fGQ" name="Function" tooltipText="" outgoingEdges="_bdRT4Dx1EeWiQ_wtFd6fGQ _bdTJEDx1EeWiQ_wtFd6fGQ _beLS0zx1EeWiQ_wtFd6fGQ" incomingEdges="_9x_-EGB0EeWUrY3nJWVIeg _VHCI0GL8EeW2rMch79jPxg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_badQcDx1EeWiQ_wtFd6fGQ" name="Function" tooltipText="" outgoingEdges="_bdRT4Dx1EeWiQ_wtFd6fGQ _bdTJEDx1EeWiQ_wtFd6fGQ _beLS0zx1EeWiQ_wtFd6fGQ" incomingEdges="_9x_-EGB0EeWUrY3nJWVIeg _VHCI0GL8EeW2rMch79jPxg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Function"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Function"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_h3pUkGL8EeW2rMch79jPxg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_h3pUkGL8EeW2rMch79jPxg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bafssDx1EeWiQ_wtFd6fGQ" name="Term" tooltipText="" outgoingEdges="_beMg8Dx1EeWiQ_wtFd6fGQ" incomingEdges="_bdVlUDx1EeWiQ_wtFd6fGQ _bdZ2wDx1EeWiQ_wtFd6fGQ _bdbE4Dx1EeWiQ_wtFd6fGQ _bdcTADx1EeWiQ_wtFd6fGQ _bdjAsDx1EeWiQ_wtFd6fGQ _bdkO0Dx1EeWiQ_wtFd6fGQ _bdlc8Dx1EeWiQ_wtFd6fGQ _bdmrEDx1EeWiQ_wtFd6fGQ _bdn5MDx1EeWiQ_wtFd6fGQ _bdpuYDx1EeWiQ_wtFd6fGQ _bdq8gDx1EeWiQ_wtFd6fGQ _bdsxsDx1EeWiQ_wtFd6fGQ _bdt_0Dx1EeWiQ_wtFd6fGQ _bdvN8Dx1EeWiQ_wtFd6fGQ _bdwcEDx1EeWiQ_wtFd6fGQ _bdyRQDx1EeWiQ_wtFd6fGQ _bdzfYDx1EeWiQ_wtFd6fGQ _bd0tgDx1EeWiQ_wtFd6fGQ _bd17oDx1EeWiQ_wtFd6fGQ _bd3JwDx1EeWiQ_wtFd6fGQ _bd4-8Dx1EeWiQ_wtFd6fGQ _bd6NEDx1EeWiQ_wtFd6fGQ _bd7bMDx1EeWiQ_wtFd6fGQ _beOWIDx1EeWiQ_wtFd6fGQ _beO9MDx1EeWiQ_wtFd6fGQ _beT1sDx1EeWiQ_wtFd6fGQ _beWR8Dx1EeWiQ_wtFd6fGQ _bebKcDx1EeWiQ_wtFd6fGQ _bek7cDx1EeWiQ_wtFd6fGQ _3jn3oGBxEeWUrY3nJWVIeg _vtC1kGB0EeWUrY3nJWVIeg _NuL4gGB2EeWUrY3nJWVIeg _RF40IGB2EeWUrY3nJWVIeg _SEkp8GB2EeWUrY3nJWVIeg _UrvggGB2EeWUrY3nJWVIeg _wgcQsIV8EeWhkpx1k3JSIA _X9kCIAGOEeaDEJmvhpl9gg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bafssDx1EeWiQ_wtFd6fGQ" name="Term" tooltipText="" outgoingEdges="_beMg8Dx1EeWiQ_wtFd6fGQ" incomingEdges="_bdVlUDx1EeWiQ_wtFd6fGQ _bdZ2wDx1EeWiQ_wtFd6fGQ _bdbE4Dx1EeWiQ_wtFd6fGQ _bdcTADx1EeWiQ_wtFd6fGQ _bdjAsDx1EeWiQ_wtFd6fGQ _bdkO0Dx1EeWiQ_wtFd6fGQ _bdlc8Dx1EeWiQ_wtFd6fGQ _bdmrEDx1EeWiQ_wtFd6fGQ _bdn5MDx1EeWiQ_wtFd6fGQ _bdpuYDx1EeWiQ_wtFd6fGQ _bdq8gDx1EeWiQ_wtFd6fGQ _bdsxsDx1EeWiQ_wtFd6fGQ _bdt_0Dx1EeWiQ_wtFd6fGQ _bdvN8Dx1EeWiQ_wtFd6fGQ _bdwcEDx1EeWiQ_wtFd6fGQ _bdyRQDx1EeWiQ_wtFd6fGQ _bdzfYDx1EeWiQ_wtFd6fGQ _bd0tgDx1EeWiQ_wtFd6fGQ _bd17oDx1EeWiQ_wtFd6fGQ _bd3JwDx1EeWiQ_wtFd6fGQ _bd4-8Dx1EeWiQ_wtFd6fGQ _bd6NEDx1EeWiQ_wtFd6fGQ _bd7bMDx1EeWiQ_wtFd6fGQ _beOWIDx1EeWiQ_wtFd6fGQ _beO9MDx1EeWiQ_wtFd6fGQ _beT1sDx1EeWiQ_wtFd6fGQ _beWR8Dx1EeWiQ_wtFd6fGQ _bebKcDx1EeWiQ_wtFd6fGQ _bek7cDx1EeWiQ_wtFd6fGQ _3jn3oGBxEeWUrY3nJWVIeg _vtC1kGB0EeWUrY3nJWVIeg _NuL4gGB2EeWUrY3nJWVIeg _RF40IGB2EeWUrY3nJWVIeg _SEkp8GB2EeWUrY3nJWVIeg _UrvggGB2EeWUrY3nJWVIeg _wgcQsIV8EeWhkpx1k3JSIA _X9kCIAGOEeaDEJmvhpl9gg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bagTwDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bagTwDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bahh4Dx1EeWiQ_wtFd6fGQ" name="SymbolicDeclaration" tooltipText="" outgoingEdges="_beNIAzx1EeWiQ_wtFd6fGQ" incomingEdges="_bdU-QDx1EeWiQ_wtFd6fGQ _beDXADx1EeWiQ_wtFd6fGQ _beLS0zx1EeWiQ_wtFd6fGQ _beTOoDx1EeWiQ_wtFd6fGQ _berCEDx1EeWiQ_wtFd6fGQ _berpIDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bahh4Dx1EeWiQ_wtFd6fGQ" name="SymbolicDeclaration" tooltipText="" outgoingEdges="_beNIAzx1EeWiQ_wtFd6fGQ" incomingEdges="_bdU-QDx1EeWiQ_wtFd6fGQ _beDXADx1EeWiQ_wtFd6fGQ _beLS0zx1EeWiQ_wtFd6fGQ _beTOoDx1EeWiQ_wtFd6fGQ _berCEDx1EeWiQ_wtFd6fGQ _berpIDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_baiI8Dx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_baiI8Dx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bcuhUDx1EeWiQ_wtFd6fGQ" name="name : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_bcuhUDx1EeWiQ_wtFd6fGQ" name="name : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//SymbolicDeclaration/name"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//SymbolicDeclaration/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bcvvcDx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT" description="_bcoasDx1EeWiQ_wtFd6fGQ">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_bcvvcDx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT" description="_bcoasDx1EeWiQ_wtFd6fGQ">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_baj-IDx1EeWiQ_wtFd6fGQ" name="SymbolicValue" tooltipText="" outgoingEdges="_bdU-QDx1EeWiQ_wtFd6fGQ _bdVlUDx1EeWiQ_wtFd6fGQ _beOWIDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_baj-IDx1EeWiQ_wtFd6fGQ" name="SymbolicValue" tooltipText="" outgoingEdges="_bdU-QDx1EeWiQ_wtFd6fGQ _bdVlUDx1EeWiQ_wtFd6fGQ _beOWIDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_baklMDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_baklMDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_balzUDx1EeWiQ_wtFd6fGQ" name="AtomicTerm" tooltipText="" outgoingEdges="_beO9MDx1EeWiQ_wtFd6fGQ" incomingEdges="_bePkQzx1EeWiQ_wtFd6fGQ _beRZcDx1EeWiQ_wtFd6fGQ _beSAgDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_balzUDx1EeWiQ_wtFd6fGQ" name="AtomicTerm" tooltipText="" outgoingEdges="_beO9MDx1EeWiQ_wtFd6fGQ" incomingEdges="_bePkQzx1EeWiQ_wtFd6fGQ _beRZcDx1EeWiQ_wtFd6fGQ _beSAgDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_banBcDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_banBcDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bao2oDx1EeWiQ_wtFd6fGQ" name="IntLiteral" tooltipText="" outgoingEdges="_bePkQzx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bao2oDx1EeWiQ_wtFd6fGQ" name="IntLiteral" tooltipText="" outgoingEdges="_bePkQzx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntLiteral"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntLiteral"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bar58Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bar58Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bcw9kDx1EeWiQ_wtFd6fGQ" name="value : EInt" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_bcw9kDx1EeWiQ_wtFd6fGQ" name="value : EInt" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//IntLiteral/value"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//IntLiteral/value"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bcxkoDx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_bcxkoDx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT">
           <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_batvIDx1EeWiQ_wtFd6fGQ" name="BoolLiteral" tooltipText="" outgoingEdges="_beRZcDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_batvIDx1EeWiQ_wtFd6fGQ" name="BoolLiteral" tooltipText="" outgoingEdges="_beRZcDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolLiteral"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolLiteral"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bau9QDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bau9QDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bcyLsDx1EeWiQ_wtFd6fGQ" name="value : EBoolean = false" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_bcyLsDx1EeWiQ_wtFd6fGQ" name="value : EBoolean = false" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//BoolLiteral/value"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//BoolLiteral/value"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bcyywDx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_bcyywDx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT">
           <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bawLYDx1EeWiQ_wtFd6fGQ" name="RealLiteral" tooltipText="" outgoingEdges="_beSAgDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bawLYDx1EeWiQ_wtFd6fGQ" name="RealLiteral" tooltipText="" outgoingEdges="_beSAgDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealLiteral"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealLiteral"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_baxZgDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_baxZgDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bczZ0Dx1EeWiQ_wtFd6fGQ" name="value : EBigDecimal" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_bczZ0Dx1EeWiQ_wtFd6fGQ" name="value : EBigDecimal" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//RealLiteral/value"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//RealLiteral/value"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bc0A4Dx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_bc0A4Dx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT">
           <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_baynoDx1EeWiQ_wtFd6fGQ" name="Variable" tooltipText="" outgoingEdges="_bdXagDx1EeWiQ_wtFd6fGQ _beTOoDx1EeWiQ_wtFd6fGQ" incomingEdges="_bdYooDx1EeWiQ_wtFd6fGQ _y4FgIGByEeWUrY3nJWVIeg _CHDSwGB1EeWUrY3nJWVIeg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_baynoDx1EeWiQ_wtFd6fGQ" name="Variable" tooltipText="" outgoingEdges="_bdXagDx1EeWiQ_wtFd6fGQ _beTOoDx1EeWiQ_wtFd6fGQ" incomingEdges="_bdYooDx1EeWiQ_wtFd6fGQ _y4FgIGByEeWUrY3nJWVIeg _CHDSwGB1EeWUrY3nJWVIeg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bazOsDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bazOsDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ba1D4Dx1EeWiQ_wtFd6fGQ" name="QuantifiedExpression" tooltipText="" outgoingEdges="_bdYooDx1EeWiQ_wtFd6fGQ _bdZ2wDx1EeWiQ_wtFd6fGQ _beT1sDx1EeWiQ_wtFd6fGQ" incomingEdges="_beUcwDx1EeWiQ_wtFd6fGQ _beVq4Dx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ba1D4Dx1EeWiQ_wtFd6fGQ" name="QuantifiedExpression" tooltipText="" outgoingEdges="_bdYooDx1EeWiQ_wtFd6fGQ _bdZ2wDx1EeWiQ_wtFd6fGQ _beT1sDx1EeWiQ_wtFd6fGQ" incomingEdges="_beUcwDx1EeWiQ_wtFd6fGQ _beVq4Dx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//QuantifiedExpression"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//QuantifiedExpression"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ba2SADx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ba2SADx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ba3gIDx1EeWiQ_wtFd6fGQ" name="Exists" tooltipText="" outgoingEdges="_beUcwDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ba3gIDx1EeWiQ_wtFd6fGQ" name="Exists" tooltipText="" outgoingEdges="_beUcwDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Exists"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Exists"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ba4uQDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ba4uQDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ba58YDx1EeWiQ_wtFd6fGQ" name="Forall" tooltipText="" outgoingEdges="_beVq4Dx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ba58YDx1EeWiQ_wtFd6fGQ" name="Forall" tooltipText="" outgoingEdges="_beVq4Dx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Forall"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Forall"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ba6jcDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ba6jcDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ba7xkDx1EeWiQ_wtFd6fGQ" name="BoolOperation" tooltipText="" outgoingEdges="_beWR8Dx1EeWiQ_wtFd6fGQ" incomingEdges="_beW5Azx1EeWiQ_wtFd6fGQ _beYHIDx1EeWiQ_wtFd6fGQ _beYuMDx1EeWiQ_wtFd6fGQ _beZVQzx1EeWiQ_wtFd6fGQ _beajYDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ba7xkDx1EeWiQ_wtFd6fGQ" name="BoolOperation" tooltipText="" outgoingEdges="_beWR8Dx1EeWiQ_wtFd6fGQ" incomingEdges="_beW5Azx1EeWiQ_wtFd6fGQ _beYHIDx1EeWiQ_wtFd6fGQ _beYuMDx1EeWiQ_wtFd6fGQ _beZVQzx1EeWiQ_wtFd6fGQ _beajYDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolOperation"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolOperation"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ba8YoDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ba8YoDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ba9mwDx1EeWiQ_wtFd6fGQ" name="And" tooltipText="" outgoingEdges="_bdbE4Dx1EeWiQ_wtFd6fGQ _beW5Azx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ba9mwDx1EeWiQ_wtFd6fGQ" name="And" tooltipText="" outgoingEdges="_bdbE4Dx1EeWiQ_wtFd6fGQ _beW5Azx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//And"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//And"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ba-N0Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ba-N0Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ba_b8Dx1EeWiQ_wtFd6fGQ" name="Or" tooltipText="" outgoingEdges="_bdcTADx1EeWiQ_wtFd6fGQ _beYHIDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ba_b8Dx1EeWiQ_wtFd6fGQ" name="Or" tooltipText="" outgoingEdges="_bdcTADx1EeWiQ_wtFd6fGQ _beYHIDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Or"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Or"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbAqEDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbAqEDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbBRIDx1EeWiQ_wtFd6fGQ" name="Impl" tooltipText="" outgoingEdges="_bdjAsDx1EeWiQ_wtFd6fGQ _bdkO0Dx1EeWiQ_wtFd6fGQ _beYuMDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbBRIDx1EeWiQ_wtFd6fGQ" name="Impl" tooltipText="" outgoingEdges="_bdjAsDx1EeWiQ_wtFd6fGQ _bdkO0Dx1EeWiQ_wtFd6fGQ _beYuMDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Impl"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Impl"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbB4MDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbB4MDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbDtYDx1EeWiQ_wtFd6fGQ" name="Not" tooltipText="" outgoingEdges="_bdlc8Dx1EeWiQ_wtFd6fGQ _beZVQzx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbDtYDx1EeWiQ_wtFd6fGQ" name="Not" tooltipText="" outgoingEdges="_bdlc8Dx1EeWiQ_wtFd6fGQ _beZVQzx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Not"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Not"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbEUcDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbEUcDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbFikDx1EeWiQ_wtFd6fGQ" name="Iff" tooltipText="" outgoingEdges="_bdmrEDx1EeWiQ_wtFd6fGQ _bdn5MDx1EeWiQ_wtFd6fGQ _beajYDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbFikDx1EeWiQ_wtFd6fGQ" name="Iff" tooltipText="" outgoingEdges="_bdmrEDx1EeWiQ_wtFd6fGQ _bdn5MDx1EeWiQ_wtFd6fGQ _beajYDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Iff"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Iff"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbGJoDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbGJoDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbGwsDx1EeWiQ_wtFd6fGQ" name="PrimitiveRelation" tooltipText="" outgoingEdges="_bebKcDx1EeWiQ_wtFd6fGQ" incomingEdges="_bebxgzx1EeWiQ_wtFd6fGQ _bec_oDx1EeWiQ_wtFd6fGQ _beeNwDx1EeWiQ_wtFd6fGQ _beifMDx1EeWiQ_wtFd6fGQ _bejtUDx1EeWiQ_wtFd6fGQ _bekUYDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbGwsDx1EeWiQ_wtFd6fGQ" name="PrimitiveRelation" tooltipText="" outgoingEdges="_bebKcDx1EeWiQ_wtFd6fGQ" incomingEdges="_bebxgzx1EeWiQ_wtFd6fGQ _bec_oDx1EeWiQ_wtFd6fGQ _beeNwDx1EeWiQ_wtFd6fGQ _beifMDx1EeWiQ_wtFd6fGQ _bejtUDx1EeWiQ_wtFd6fGQ _bekUYDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveRelation"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveRelation"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbHXwDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbHXwDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbIl4Dx1EeWiQ_wtFd6fGQ" name="Equals" tooltipText="" outgoingEdges="_bdpuYDx1EeWiQ_wtFd6fGQ _bdq8gDx1EeWiQ_wtFd6fGQ _bebxgzx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbIl4Dx1EeWiQ_wtFd6fGQ" name="Equals" tooltipText="" outgoingEdges="_bdpuYDx1EeWiQ_wtFd6fGQ _bdq8gDx1EeWiQ_wtFd6fGQ _bebxgzx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Equals"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Equals"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbJM8Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbJM8Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbKbEDx1EeWiQ_wtFd6fGQ" name="Distinct" tooltipText="" outgoingEdges="_bdsxsDx1EeWiQ_wtFd6fGQ _bec_oDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbKbEDx1EeWiQ_wtFd6fGQ" name="Distinct" tooltipText="" outgoingEdges="_bdsxsDx1EeWiQ_wtFd6fGQ _bec_oDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Distinct"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Distinct"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbLpMDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbLpMDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbNeYDx1EeWiQ_wtFd6fGQ" name="LessThan" tooltipText="" outgoingEdges="_bdt_0Dx1EeWiQ_wtFd6fGQ _bdvN8Dx1EeWiQ_wtFd6fGQ _beeNwDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbNeYDx1EeWiQ_wtFd6fGQ" name="LessThan" tooltipText="" outgoingEdges="_bdt_0Dx1EeWiQ_wtFd6fGQ _bdvN8Dx1EeWiQ_wtFd6fGQ _beeNwDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessThan"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessThan"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbOFcDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbOFcDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbPTkDx1EeWiQ_wtFd6fGQ" name="MoreThan" tooltipText="" outgoingEdges="_bdwcEDx1EeWiQ_wtFd6fGQ _bdyRQDx1EeWiQ_wtFd6fGQ _beifMDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbPTkDx1EeWiQ_wtFd6fGQ" name="MoreThan" tooltipText="" outgoingEdges="_bdwcEDx1EeWiQ_wtFd6fGQ _bdyRQDx1EeWiQ_wtFd6fGQ _beifMDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreThan"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreThan"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbQhsDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbQhsDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbRIwDx1EeWiQ_wtFd6fGQ" name="LessOrEqualThan" tooltipText="" outgoingEdges="_bdzfYDx1EeWiQ_wtFd6fGQ _bd0tgDx1EeWiQ_wtFd6fGQ _bejtUDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbRIwDx1EeWiQ_wtFd6fGQ" name="LessOrEqualThan" tooltipText="" outgoingEdges="_bdzfYDx1EeWiQ_wtFd6fGQ _bd0tgDx1EeWiQ_wtFd6fGQ _bejtUDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessOrEqualThan"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessOrEqualThan"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbSW4Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbSW4Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbTlADx1EeWiQ_wtFd6fGQ" name="MoreOrEqualThan" tooltipText="" outgoingEdges="_bd17oDx1EeWiQ_wtFd6fGQ _bd3JwDx1EeWiQ_wtFd6fGQ _bekUYDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbTlADx1EeWiQ_wtFd6fGQ" name="MoreOrEqualThan" tooltipText="" outgoingEdges="_bd17oDx1EeWiQ_wtFd6fGQ _bd3JwDx1EeWiQ_wtFd6fGQ _bekUYDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreOrEqualThan"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreOrEqualThan"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbUMEDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbUMEDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbVaMDx1EeWiQ_wtFd6fGQ" name="IntOperation" tooltipText="" outgoingEdges="_bd4-8Dx1EeWiQ_wtFd6fGQ _bd6NEDx1EeWiQ_wtFd6fGQ _bek7cDx1EeWiQ_wtFd6fGQ" incomingEdges="_bemJkDx1EeWiQ_wtFd6fGQ _bemwoDx1EeWiQ_wtFd6fGQ _ben-wDx1EeWiQ_wtFd6fGQ _bepM4Dx1EeWiQ_wtFd6fGQ _bepz8Dx1EeWiQ_wtFd6fGQ" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntOperation"/>
-      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntOperation"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbWBQDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbVaMDx1EeWiQ_wtFd6fGQ" name="IntOperation" tooltipText="" outgoingEdges="_bd4-8Dx1EeWiQ_wtFd6fGQ _bd6NEDx1EeWiQ_wtFd6fGQ _bek7cDx1EeWiQ_wtFd6fGQ" incomingEdges="_bemJkDx1EeWiQ_wtFd6fGQ _bemwoDx1EeWiQ_wtFd6fGQ _ben-wDx1EeWiQ_wtFd6fGQ _bepM4Dx1EeWiQ_wtFd6fGQ _bepz8Dx1EeWiQ_wtFd6fGQ" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//NumericOperation"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//NumericOperation"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbWBQDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbaSsDx1EeWiQ_wtFd6fGQ" name="Plus" tooltipText="" outgoingEdges="_bemJkDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbaSsDx1EeWiQ_wtFd6fGQ" name="Plus" tooltipText="" outgoingEdges="_bemJkDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Plus"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Plus"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bba5wDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bba5wDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbekIDx1EeWiQ_wtFd6fGQ" name="Minus" tooltipText="" outgoingEdges="_bemwoDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbekIDx1EeWiQ_wtFd6fGQ" name="Minus" tooltipText="" outgoingEdges="_bemwoDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Minus"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Minus"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbfLMDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbfLMDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbgZUDx1EeWiQ_wtFd6fGQ" name="Multiply" tooltipText="" outgoingEdges="_ben-wDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbgZUDx1EeWiQ_wtFd6fGQ" name="Multiply" tooltipText="" outgoingEdges="_ben-wDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Multiply"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Multiply"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbhncDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbhncDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbi1kDx1EeWiQ_wtFd6fGQ" name="Divison" tooltipText="" outgoingEdges="_bepM4Dx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbi1kDx1EeWiQ_wtFd6fGQ" name="Divison" tooltipText="" outgoingEdges="_bepM4Dx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Divison"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Divison"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbjcoDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbjcoDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbkqwDx1EeWiQ_wtFd6fGQ" name="Mod" tooltipText="" outgoingEdges="_bepz8Dx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbkqwDx1EeWiQ_wtFd6fGQ" name="Mod" tooltipText="" outgoingEdges="_bepz8Dx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Mod"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Mod"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bblR0Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bblR0Dx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbl44Dx1EeWiQ_wtFd6fGQ" name="TypeDescriptor" tooltipText="" incomingEdges="_beBh0Dx1EeWiQ_wtFd6fGQ _beGaUDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbl44Dx1EeWiQ_wtFd6fGQ" name="TypeDescriptor" tooltipText="" incomingEdges="_beBh0Dx1EeWiQ_wtFd6fGQ _beGaUDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDescriptor"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDescriptor"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbmf8Dx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbmf8Dx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbnuEDx1EeWiQ_wtFd6fGQ" name="TermDescription" tooltipText="" incomingEdges="_beMg8Dx1EeWiQ_wtFd6fGQ _beNIAzx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbnuEDx1EeWiQ_wtFd6fGQ" name="TermDescription" tooltipText="" incomingEdges="_beMg8Dx1EeWiQ_wtFd6fGQ _beNIAzx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bboVIDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bboVIDx1EeWiQ_wtFd6fGQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbpjQDx1EeWiQ_wtFd6fGQ" name="Assertion" tooltipText="" outgoingEdges="_bd7bMDx1EeWiQ_wtFd6fGQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbpjQDx1EeWiQ_wtFd6fGQ" name="Assertion" tooltipText="" outgoingEdges="_bd7bMDx1EeWiQ_wtFd6fGQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Assertion"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Assertion"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_bbqKUDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_bbqKUDx1EeWiQ_wtFd6fGQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bc45YDx1EeWiQ_wtFd6fGQ" name="name : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_bc45YDx1EeWiQ_wtFd6fGQ" name="name : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Assertion/name"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Assertion/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_bc5gcDx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT" description="_bcoasDx1EeWiQ_wtFd6fGQ">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_bc5gcDx1EeWiQ_wtFd6fGQ" labelAlignment="LEFT" description="_bcoasDx1EeWiQ_wtFd6fGQ">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbrYcDx1EeWiQ_wtFd6fGQ" name="Relation" tooltipText="" outgoingEdges="_bd8pUzx1EeWiQ_wtFd6fGQ _berCEDx1EeWiQ_wtFd6fGQ" incomingEdges="_OYoXIGL8EeW2rMch79jPxg _WpVCAGL8EeW2rMch79jPxg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbrYcDx1EeWiQ_wtFd6fGQ" name="Relation" tooltipText="" outgoingEdges="_bd8pUzx1EeWiQ_wtFd6fGQ _berCEDx1EeWiQ_wtFd6fGQ" incomingEdges="_OYoXIGL8EeW2rMch79jPxg _WpVCAGL8EeW2rMch79jPxg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_h3sX4GL8EeW2rMch79jPxg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_h3sX4GL8EeW2rMch79jPxg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_bbsmkDx1EeWiQ_wtFd6fGQ" name="Constant" tooltipText="" outgoingEdges="_bd-egDx1EeWiQ_wtFd6fGQ _berpIDx1EeWiQ_wtFd6fGQ" incomingEdges="_08lj8GBxEeWUrY3nJWVIeg _Hjg5cGL8EeW2rMch79jPxg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_bbsmkDx1EeWiQ_wtFd6fGQ" name="Constant" tooltipText="" outgoingEdges="_bd-egDx1EeWiQ_wtFd6fGQ _berpIDx1EeWiQ_wtFd6fGQ" incomingEdges="_08lj8GBxEeWUrY3nJWVIeg _Hjg5cGL8EeW2rMch79jPxg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Constant"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Constant"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ZeJTAGL8EeW2rMch79jPxg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ZeJTAGL8EeW2rMch79jPxg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdQs0Dx1EeWiQ_wtFd6fGQ" name="[0..1] referred" sourceNode="_baMxwDx1EeWiQ_wtFd6fGQ" targetNode="_bZ1lYDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdQs0Dx1EeWiQ_wtFd6fGQ" name="[0..1] referred" sourceNode="_baMxwDx1EeWiQ_wtFd6fGQ" targetNode="_bZ1lYDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//ComplexTypeReference/referred"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//ComplexTypeReference/referred"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdQs0Tx1EeWiQ_wtFd6fGQ" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdQs0Tx1EeWiQ_wtFd6fGQ" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdQs0jx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdQs0jx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdQs0zx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdQs0zx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdRT4Dx1EeWiQ_wtFd6fGQ" name="[1..1] range" sourceNode="_badQcDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdRT4Dx1EeWiQ_wtFd6fGQ" name="[1..1] range" sourceNode="_badQcDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/range"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/range"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_eVC6oIWlEeWhkpx1k3JSIA" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_eVC6oYWlEeWhkpx1k3JSIA" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_eVC6oIWlEeWhkpx1k3JSIA" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_eVC6oYWlEeWhkpx1k3JSIA" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_eVC6ooWlEeWhkpx1k3JSIA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_eVC6ooWlEeWhkpx1k3JSIA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdTJEDx1EeWiQ_wtFd6fGQ" name="[0..*] parameters" sourceNode="_badQcDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdTJEDx1EeWiQ_wtFd6fGQ" name="[0..*] parameters" sourceNode="_badQcDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/parameters"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/parameters"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdUXMDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdUXMTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdUXMDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdUXMTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdUXMjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdUXMjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdU-QDx1EeWiQ_wtFd6fGQ" name="[0..1] symbolicReference" sourceNode="_baj-IDx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdU-QDx1EeWiQ_wtFd6fGQ" name="[0..1] symbolicReference" sourceNode="_baj-IDx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdU-QTx1EeWiQ_wtFd6fGQ" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdU-QTx1EeWiQ_wtFd6fGQ" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdU-Qjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdU-Qjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdU-Qzx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdU-Qzx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdVlUDx1EeWiQ_wtFd6fGQ" name="[0..*] parameterSubstitutions" sourceNode="_baj-IDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdVlUDx1EeWiQ_wtFd6fGQ" name="[0..*] parameterSubstitutions" sourceNode="_baj-IDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/parameterSubstitutions"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/parameterSubstitutions"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdWzcDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdWzcTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdWzcDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdWzcTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdWzcjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdWzcjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdXagDx1EeWiQ_wtFd6fGQ" name="[1..1] range" sourceNode="_baynoDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdXagDx1EeWiQ_wtFd6fGQ" name="[1..1] range" sourceNode="_baynoDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Variable/range"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Variable/range"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_e9h28IWlEeWhkpx1k3JSIA" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_e9h28YWlEeWhkpx1k3JSIA" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_e9h28IWlEeWhkpx1k3JSIA" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_e9h28YWlEeWhkpx1k3JSIA" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_e9h28oWlEeWhkpx1k3JSIA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_e9h28oWlEeWhkpx1k3JSIA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdYooDx1EeWiQ_wtFd6fGQ" name="[0..*] quantifiedVariables" sourceNode="_ba1D4Dx1EeWiQ_wtFd6fGQ" targetNode="_baynoDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdYooDx1EeWiQ_wtFd6fGQ" name="[0..*] quantifiedVariables" sourceNode="_ba1D4Dx1EeWiQ_wtFd6fGQ" targetNode="_baynoDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//QuantifiedExpression/quantifiedVariables"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//QuantifiedExpression/quantifiedVariables"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdZPsDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdZPsTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdZPsDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdZPsTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdZPsjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdZPsjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdZ2wDx1EeWiQ_wtFd6fGQ" name="[0..1] expression" sourceNode="_ba1D4Dx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdZ2wDx1EeWiQ_wtFd6fGQ" name="[0..1] expression" sourceNode="_ba1D4Dx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//QuantifiedExpression/expression"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//QuantifiedExpression/expression"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdad0Dx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdad0Tx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdad0Dx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdad0Tx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdad0jx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdad0jx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdbE4Dx1EeWiQ_wtFd6fGQ" name="[0..*] operands" sourceNode="_ba9mwDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdbE4Dx1EeWiQ_wtFd6fGQ" name="[0..*] operands" sourceNode="_ba9mwDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//And/operands"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//And/operands"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdbr8Dx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdbr8Tx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdbr8Dx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdbr8Tx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdbr8jx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdbr8jx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdcTADx1EeWiQ_wtFd6fGQ" name="[0..*] operands" sourceNode="_ba_b8Dx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdcTADx1EeWiQ_wtFd6fGQ" name="[0..*] operands" sourceNode="_ba_b8Dx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Or/operands"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Or/operands"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdc6EDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdc6ETx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdc6EDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdc6ETx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdc6Ejx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdc6Ejx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdjAsDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbBRIDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdjAsDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbBRIDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Impl/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Impl/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdjnwDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdjnwTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdjnwDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdjnwTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdjnwjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdjnwjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdkO0Dx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbBRIDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdkO0Dx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbBRIDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Impl/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Impl/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdk14Dx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdk14Tx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdk14Dx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdk14Tx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdk14jx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdk14jx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdlc8Dx1EeWiQ_wtFd6fGQ" name="[0..1] operand" sourceNode="_bbDtYDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdlc8Dx1EeWiQ_wtFd6fGQ" name="[0..1] operand" sourceNode="_bbDtYDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Not/operand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Not/operand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdmEADx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdmEATx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdmEADx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdmEATx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdmEAjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdmEAjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdmrEDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbFikDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdmrEDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbFikDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Iff/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Iff/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdnSIDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdnSITx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdnSIDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdnSITx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdnSIjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdnSIjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdn5MDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbFikDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdn5MDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbFikDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Iff/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Iff/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdogQDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdogQTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdogQDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdogQTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdogQjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdogQjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdpuYDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbIl4Dx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdpuYDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbIl4Dx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Equals/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Equals/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdqVcDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdqVcTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdqVcDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdqVcTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdqVcjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdqVcjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdq8gDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbIl4Dx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdq8gDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbIl4Dx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Equals/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Equals/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdsKoDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdsKoTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdsKoDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdsKoTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdsKojx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdsKojx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdsxsDx1EeWiQ_wtFd6fGQ" name="[0..*] operands" sourceNode="_bbKbEDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdsxsDx1EeWiQ_wtFd6fGQ" name="[0..*] operands" sourceNode="_bbKbEDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Distinct/operands"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Distinct/operands"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdtYwDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdtYwTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdtYwDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdtYwTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdtYwjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdtYwjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdt_0Dx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbNeYDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdt_0Dx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbNeYDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessThan/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessThan/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdum4Dx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdum4Tx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdum4Dx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdum4Tx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdum4jx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdum4jx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdvN8Dx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbNeYDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdvN8Dx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbNeYDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessThan/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessThan/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdv1ADx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdv1ATx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdv1ADx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdv1ATx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdv1Ajx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdv1Ajx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdwcEDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbPTkDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdwcEDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbPTkDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreThan/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreThan/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdxqMDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdxqMTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdxqMDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdxqMTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdxqMjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdxqMjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdyRQDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbPTkDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdyRQDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbPTkDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreThan/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreThan/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bdy4UDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bdy4UTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bdy4UDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bdy4UTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bdy4Ujx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bdy4Ujx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bdzfYDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbRIwDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bdzfYDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbRIwDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessOrEqualThan/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessOrEqualThan/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bd0GcDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bd0GcTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bd0GcDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bd0GcTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bd0Gcjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bd0Gcjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bd0tgDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbRIwDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bd0tgDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbRIwDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessOrEqualThan/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessOrEqualThan/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bd1UkDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bd1UkTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bd1UkDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bd1UkTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bd1Ukjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bd1Ukjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bd17oDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbTlADx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bd17oDx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbTlADx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreOrEqualThan/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreOrEqualThan/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bd2isDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bd2isTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bd2isDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bd2isTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bd2isjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bd2isjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bd3JwDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbTlADx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bd3JwDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbTlADx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreOrEqualThan/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreOrEqualThan/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bd4X4Dx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bd4X4Tx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bd4X4Dx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bd4X4Tx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bd4X4jx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bd4X4jx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bd4-8Dx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbVaMDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
-      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IntOperation/leftOperand"/>
-      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IntOperation/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bd5mADx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bd5mATx1EeWiQ_wtFd6fGQ" showIcon="false">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bd4-8Dx1EeWiQ_wtFd6fGQ" name="[0..1] leftOperand" sourceNode="_bbVaMDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//NumericOperation/leftOperand"/>
+      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//NumericOperation/leftOperand"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bd5mADx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bd5mATx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bd5mAjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bd5mAjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bd6NEDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbVaMDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
-      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IntOperation/rightOperand"/>
-      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IntOperation/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bd60IDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bd60ITx1EeWiQ_wtFd6fGQ" showIcon="false">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bd6NEDx1EeWiQ_wtFd6fGQ" name="[0..1] rightOperand" sourceNode="_bbVaMDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//NumericOperation/rightOperand"/>
+      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//NumericOperation/rightOperand"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bd60IDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bd60ITx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bd60Ijx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bd60Ijx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bd7bMDx1EeWiQ_wtFd6fGQ" name="[1..1] value" sourceNode="_bbpjQDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bd7bMDx1EeWiQ_wtFd6fGQ" name="[1..1] value" sourceNode="_bbpjQDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Assertion/value"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Assertion/value"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bd8pUDx1EeWiQ_wtFd6fGQ" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bd8pUTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bd8pUDx1EeWiQ_wtFd6fGQ" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bd8pUTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bd8pUjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bd8pUjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bd8pUzx1EeWiQ_wtFd6fGQ" name="[0..*] parameters" sourceNode="_bbrYcDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bd8pUzx1EeWiQ_wtFd6fGQ" name="[0..*] parameters" sourceNode="_bbrYcDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/parameters"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/parameters"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bd93cDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bd93cTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bd93cDx1EeWiQ_wtFd6fGQ" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bd93cTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bd93cjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bd93cjx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bd-egDx1EeWiQ_wtFd6fGQ" name="[1..1] type" sourceNode="_bbsmkDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bd-egDx1EeWiQ_wtFd6fGQ" name="[1..1] type" sourceNode="_bbsmkDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/type"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/type"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bd_soDx1EeWiQ_wtFd6fGQ" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bd_soTx1EeWiQ_wtFd6fGQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bd_soDx1EeWiQ_wtFd6fGQ" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bd_soTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_bd_sojx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_bd_sojx1EeWiQ_wtFd6fGQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beBh0Dx1EeWiQ_wtFd6fGQ" sourceNode="_bZ1lYDx1EeWiQ_wtFd6fGQ" targetNode="_bbl44Dx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beBh0Dx1EeWiQ_wtFd6fGQ" sourceNode="_bZ1lYDx1EeWiQ_wtFd6fGQ" targetNode="_bbl44Dx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Type"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Type/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_5YyOgIPIEeWOre-0TMCmMQ" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_5YyOgIPIEeWOre-0TMCmMQ" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_5YyOgYPIEeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_5YyOgYPIEeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_5YyOgoPIEeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_5YyOgoPIEeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beDXADx1EeWiQ_wtFd6fGQ" sourceNode="_baDn0Dx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beDXADx1EeWiQ_wtFd6fGQ" sourceNode="_baDn0Dx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//DefinedElement/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beD-EDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beD-EDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beD-ETx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beD-ETx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beD-Ejx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beD-Ejx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beElIDx1EeWiQ_wtFd6fGQ" sourceNode="_baGEEDx1EeWiQ_wtFd6fGQ" targetNode="_bZ1lYDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beElIDx1EeWiQ_wtFd6fGQ" sourceNode="_baGEEDx1EeWiQ_wtFd6fGQ" targetNode="_bZ1lYDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDefinition"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//TypeDefinition/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beElITx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beElITx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beElIjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beElIjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beElIzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beElIzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beGaUDx1EeWiQ_wtFd6fGQ" sourceNode="_baKVgDx1EeWiQ_wtFd6fGQ" targetNode="_bbl44Dx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beGaUDx1EeWiQ_wtFd6fGQ" sourceNode="_baKVgDx1EeWiQ_wtFd6fGQ" targetNode="_bbl44Dx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//TypeReference/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beGaUTx1EeWiQ_wtFd6fGQ" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beGaUTx1EeWiQ_wtFd6fGQ" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beGaUjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beGaUjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beGaUzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beGaUzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beHBYDx1EeWiQ_wtFd6fGQ" sourceNode="_baMxwDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beHBYDx1EeWiQ_wtFd6fGQ" sourceNode="_baMxwDx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ComplexTypeReference"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//ComplexTypeReference/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beHocDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beHocDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beHocTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beHocTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beHocjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beHocjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beHoczx1EeWiQ_wtFd6fGQ" sourceNode="_baPOADx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beHoczx1EeWiQ_wtFd6fGQ" sourceNode="_baPOADx1EeWiQ_wtFd6fGQ" targetNode="_baKVgDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveTypeReference"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//PrimitiveTypeReference/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beIPgDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beIPgDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beIPgTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beIPgTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beIPgjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beIPgjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beIPgzx1EeWiQ_wtFd6fGQ" sourceNode="_baRDMDx1EeWiQ_wtFd6fGQ" targetNode="_baPOADx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beIPgzx1EeWiQ_wtFd6fGQ" sourceNode="_baRDMDx1EeWiQ_wtFd6fGQ" targetNode="_baPOADx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntTypeReference"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//IntTypeReference/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beI2kDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beI2kDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beI2kTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beI2kTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beI2kjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beI2kjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beJdoDx1EeWiQ_wtFd6fGQ" sourceNode="_baYX8Dx1EeWiQ_wtFd6fGQ" targetNode="_baPOADx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beJdoDx1EeWiQ_wtFd6fGQ" sourceNode="_baYX8Dx1EeWiQ_wtFd6fGQ" targetNode="_baPOADx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolTypeReference"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//BoolTypeReference/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beKEsDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beKEsDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beKEsTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beKEsTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beKEsjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beKEsjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beKrwDx1EeWiQ_wtFd6fGQ" sourceNode="_baa0MDx1EeWiQ_wtFd6fGQ" targetNode="_baPOADx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beKrwDx1EeWiQ_wtFd6fGQ" sourceNode="_baa0MDx1EeWiQ_wtFd6fGQ" targetNode="_baPOADx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealTypeReference"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//RealTypeReference/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beLS0Dx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beLS0Dx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beLS0Tx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beLS0Tx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beLS0jx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beLS0jx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beLS0zx1EeWiQ_wtFd6fGQ" sourceNode="_badQcDx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beLS0zx1EeWiQ_wtFd6fGQ" sourceNode="_badQcDx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Function"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Function/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beL54Dx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beL54Dx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beL54Tx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beL54Tx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beL54jx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beL54jx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beMg8Dx1EeWiQ_wtFd6fGQ" sourceNode="_bafssDx1EeWiQ_wtFd6fGQ" targetNode="_bbnuEDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beMg8Dx1EeWiQ_wtFd6fGQ" sourceNode="_bafssDx1EeWiQ_wtFd6fGQ" targetNode="_bbnuEDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Term/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beNIADx1EeWiQ_wtFd6fGQ" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beNIADx1EeWiQ_wtFd6fGQ" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beNIATx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beNIATx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beNIAjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beNIAjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beNIAzx1EeWiQ_wtFd6fGQ" sourceNode="_bahh4Dx1EeWiQ_wtFd6fGQ" targetNode="_bbnuEDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beNIAzx1EeWiQ_wtFd6fGQ" sourceNode="_bahh4Dx1EeWiQ_wtFd6fGQ" targetNode="_bbnuEDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//SymbolicDeclaration/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beNvEDx1EeWiQ_wtFd6fGQ" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beNvEDx1EeWiQ_wtFd6fGQ" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beNvETx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beNvETx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beNvEjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beNvEjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beOWIDx1EeWiQ_wtFd6fGQ" sourceNode="_baj-IDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beOWIDx1EeWiQ_wtFd6fGQ" sourceNode="_baj-IDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//SymbolicValue/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beOWITx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beOWITx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beOWIjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beOWIjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beOWIzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beOWIzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beO9MDx1EeWiQ_wtFd6fGQ" sourceNode="_balzUDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beO9MDx1EeWiQ_wtFd6fGQ" sourceNode="_balzUDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//AtomicTerm/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bePkQDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bePkQDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bePkQTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_bePkQTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bePkQjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bePkQjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bePkQzx1EeWiQ_wtFd6fGQ" sourceNode="_bao2oDx1EeWiQ_wtFd6fGQ" targetNode="_balzUDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bePkQzx1EeWiQ_wtFd6fGQ" sourceNode="_bao2oDx1EeWiQ_wtFd6fGQ" targetNode="_balzUDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntLiteral"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//IntLiteral/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beQLUDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beQLUDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beQLUTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beQLUTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beQLUjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beQLUjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beRZcDx1EeWiQ_wtFd6fGQ" sourceNode="_batvIDx1EeWiQ_wtFd6fGQ" targetNode="_balzUDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beRZcDx1EeWiQ_wtFd6fGQ" sourceNode="_batvIDx1EeWiQ_wtFd6fGQ" targetNode="_balzUDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolLiteral"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//BoolLiteral/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beRZcTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beRZcTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beRZcjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beRZcjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beRZczx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beRZczx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beSAgDx1EeWiQ_wtFd6fGQ" sourceNode="_bawLYDx1EeWiQ_wtFd6fGQ" targetNode="_balzUDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beSAgDx1EeWiQ_wtFd6fGQ" sourceNode="_bawLYDx1EeWiQ_wtFd6fGQ" targetNode="_balzUDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealLiteral"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//RealLiteral/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beSnkDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beSnkDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beSnkTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beSnkTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beSnkjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beSnkjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beTOoDx1EeWiQ_wtFd6fGQ" sourceNode="_baynoDx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beTOoDx1EeWiQ_wtFd6fGQ" sourceNode="_baynoDx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Variable/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beTOoTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beTOoTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beTOojx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beTOojx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beTOozx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beTOozx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beT1sDx1EeWiQ_wtFd6fGQ" sourceNode="_ba1D4Dx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beT1sDx1EeWiQ_wtFd6fGQ" sourceNode="_ba1D4Dx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//QuantifiedExpression"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//QuantifiedExpression/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beT1sTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beT1sTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beT1sjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beT1sjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beT1szx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beT1szx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beUcwDx1EeWiQ_wtFd6fGQ" sourceNode="_ba3gIDx1EeWiQ_wtFd6fGQ" targetNode="_ba1D4Dx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beUcwDx1EeWiQ_wtFd6fGQ" sourceNode="_ba3gIDx1EeWiQ_wtFd6fGQ" targetNode="_ba1D4Dx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Exists"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Exists/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beVD0Dx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beVD0Dx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beVD0Tx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beVD0Tx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beVD0jx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beVD0jx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beVq4Dx1EeWiQ_wtFd6fGQ" sourceNode="_ba58YDx1EeWiQ_wtFd6fGQ" targetNode="_ba1D4Dx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beVq4Dx1EeWiQ_wtFd6fGQ" sourceNode="_ba58YDx1EeWiQ_wtFd6fGQ" targetNode="_ba1D4Dx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Forall"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Forall/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beVq4Tx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beVq4Tx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beVq4jx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beVq4jx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beVq4zx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beVq4zx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beWR8Dx1EeWiQ_wtFd6fGQ" sourceNode="_ba7xkDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beWR8Dx1EeWiQ_wtFd6fGQ" sourceNode="_ba7xkDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolOperation"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//BoolOperation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beW5ADx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beW5ADx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beW5ATx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beW5ATx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beW5Ajx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beW5Ajx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beW5Azx1EeWiQ_wtFd6fGQ" sourceNode="_ba9mwDx1EeWiQ_wtFd6fGQ" targetNode="_ba7xkDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beW5Azx1EeWiQ_wtFd6fGQ" sourceNode="_ba9mwDx1EeWiQ_wtFd6fGQ" targetNode="_ba7xkDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//And"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//And/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beXgEDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beXgEDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beXgETx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beXgETx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beXgEjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beXgEjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beYHIDx1EeWiQ_wtFd6fGQ" sourceNode="_ba_b8Dx1EeWiQ_wtFd6fGQ" targetNode="_ba7xkDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beYHIDx1EeWiQ_wtFd6fGQ" sourceNode="_ba_b8Dx1EeWiQ_wtFd6fGQ" targetNode="_ba7xkDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Or"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Or/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beYHITx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beYHITx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beYHIjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beYHIjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beYHIzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beYHIzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beYuMDx1EeWiQ_wtFd6fGQ" sourceNode="_bbBRIDx1EeWiQ_wtFd6fGQ" targetNode="_ba7xkDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beYuMDx1EeWiQ_wtFd6fGQ" sourceNode="_bbBRIDx1EeWiQ_wtFd6fGQ" targetNode="_ba7xkDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Impl"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Impl/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beZVQDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beZVQDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beZVQTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beZVQTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beZVQjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beZVQjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beZVQzx1EeWiQ_wtFd6fGQ" sourceNode="_bbDtYDx1EeWiQ_wtFd6fGQ" targetNode="_ba7xkDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beZVQzx1EeWiQ_wtFd6fGQ" sourceNode="_bbDtYDx1EeWiQ_wtFd6fGQ" targetNode="_ba7xkDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Not"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Not/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beZ8UDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beZ8UDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beZ8UTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beZ8UTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beZ8Ujx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beZ8Ujx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beajYDx1EeWiQ_wtFd6fGQ" sourceNode="_bbFikDx1EeWiQ_wtFd6fGQ" targetNode="_ba7xkDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beajYDx1EeWiQ_wtFd6fGQ" sourceNode="_bbFikDx1EeWiQ_wtFd6fGQ" targetNode="_ba7xkDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Iff"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Iff/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beajYTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beajYTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beajYjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beajYjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beajYzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beajYzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bebKcDx1EeWiQ_wtFd6fGQ" sourceNode="_bbGwsDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bebKcDx1EeWiQ_wtFd6fGQ" sourceNode="_bbGwsDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveRelation"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//PrimitiveRelation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bebxgDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bebxgDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bebxgTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_bebxgTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bebxgjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bebxgjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bebxgzx1EeWiQ_wtFd6fGQ" sourceNode="_bbIl4Dx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bebxgzx1EeWiQ_wtFd6fGQ" sourceNode="_bbIl4Dx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Equals"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Equals/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_becYkDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_becYkDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_becYkTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_becYkTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_becYkjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_becYkjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bec_oDx1EeWiQ_wtFd6fGQ" sourceNode="_bbKbEDx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bec_oDx1EeWiQ_wtFd6fGQ" sourceNode="_bbKbEDx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Distinct"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Distinct/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bedmsDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bedmsDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bedmsTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_bedmsTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bedmsjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bedmsjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beeNwDx1EeWiQ_wtFd6fGQ" sourceNode="_bbNeYDx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beeNwDx1EeWiQ_wtFd6fGQ" sourceNode="_bbNeYDx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessThan"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//LessThan/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beeNwTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beeNwTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beeNwjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beeNwjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beeNwzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beeNwzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_beifMDx1EeWiQ_wtFd6fGQ" sourceNode="_bbPTkDx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_beifMDx1EeWiQ_wtFd6fGQ" sourceNode="_bbPTkDx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreThan"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//MoreThan/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bejGQDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bejGQDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bejGQTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_bejGQTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bejGQjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bejGQjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bejtUDx1EeWiQ_wtFd6fGQ" sourceNode="_bbRIwDx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bejtUDx1EeWiQ_wtFd6fGQ" sourceNode="_bbRIwDx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessOrEqualThan"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//LessOrEqualThan/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bejtUTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bejtUTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bejtUjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_bejtUjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bejtUzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bejtUzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bekUYDx1EeWiQ_wtFd6fGQ" sourceNode="_bbTlADx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bekUYDx1EeWiQ_wtFd6fGQ" sourceNode="_bbTlADx1EeWiQ_wtFd6fGQ" targetNode="_bbGwsDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreOrEqualThan"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//MoreOrEqualThan/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bekUYTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bekUYTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bekUYjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_bekUYjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bekUYzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bekUYzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bek7cDx1EeWiQ_wtFd6fGQ" sourceNode="_bbVaMDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
-      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntOperation"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//IntOperation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beligDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bek7cDx1EeWiQ_wtFd6fGQ" sourceNode="_bbVaMDx1EeWiQ_wtFd6fGQ" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//NumericOperation"/>
+      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//NumericOperation/@eGenericSuperTypes.0"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beligDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beligTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beligTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beligjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beligjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bemJkDx1EeWiQ_wtFd6fGQ" sourceNode="_bbaSsDx1EeWiQ_wtFd6fGQ" targetNode="_bbVaMDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bemJkDx1EeWiQ_wtFd6fGQ" sourceNode="_bbaSsDx1EeWiQ_wtFd6fGQ" targetNode="_bbVaMDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Plus"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Plus/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bemJkTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bemJkTx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bemJkjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_bemJkjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bemJkzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bemJkzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bemwoDx1EeWiQ_wtFd6fGQ" sourceNode="_bbekIDx1EeWiQ_wtFd6fGQ" targetNode="_bbVaMDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bemwoDx1EeWiQ_wtFd6fGQ" sourceNode="_bbekIDx1EeWiQ_wtFd6fGQ" targetNode="_bbVaMDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Minus"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Minus/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_benXsDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_benXsDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_benXsTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_benXsTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_benXsjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_benXsjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_ben-wDx1EeWiQ_wtFd6fGQ" sourceNode="_bbgZUDx1EeWiQ_wtFd6fGQ" targetNode="_bbVaMDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ben-wDx1EeWiQ_wtFd6fGQ" sourceNode="_bbgZUDx1EeWiQ_wtFd6fGQ" targetNode="_bbVaMDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Multiply"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Multiply/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_beol0Dx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_beol0Dx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_beol0Tx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_beol0Tx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_beol0jx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_beol0jx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bepM4Dx1EeWiQ_wtFd6fGQ" sourceNode="_bbi1kDx1EeWiQ_wtFd6fGQ" targetNode="_bbVaMDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bepM4Dx1EeWiQ_wtFd6fGQ" sourceNode="_bbi1kDx1EeWiQ_wtFd6fGQ" targetNode="_bbVaMDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Divison"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Divison/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bepM4Tx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bepM4Tx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bepM4jx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_bepM4jx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bepM4zx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bepM4zx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_bepz8Dx1EeWiQ_wtFd6fGQ" sourceNode="_bbkqwDx1EeWiQ_wtFd6fGQ" targetNode="_bbVaMDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_bepz8Dx1EeWiQ_wtFd6fGQ" sourceNode="_bbkqwDx1EeWiQ_wtFd6fGQ" targetNode="_bbVaMDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Mod"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Mod/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_bepz8Tx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_bepz8Tx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_bepz8jx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_bepz8jx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_bepz8zx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_bepz8zx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_berCEDx1EeWiQ_wtFd6fGQ" sourceNode="_bbrYcDx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_berCEDx1EeWiQ_wtFd6fGQ" sourceNode="_bbrYcDx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Relation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_berCETx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_berCETx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_berCEjx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_berCEjx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_berCEzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_berCEzx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_berpIDx1EeWiQ_wtFd6fGQ" sourceNode="_bbsmkDx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_berpIDx1EeWiQ_wtFd6fGQ" sourceNode="_bbsmkDx1EeWiQ_wtFd6fGQ" targetNode="_bahh4Dx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Constant"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Constant/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_besQMDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_besQMDx1EeWiQ_wtFd6fGQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_besQMTx1EeWiQ_wtFd6fGQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_besQMTx1EeWiQ_wtFd6fGQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_besQMjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_besQMjx1EeWiQ_wtFd6fGQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_wdcfIGBxEeWUrY3nJWVIeg" name="ConstantDefinition" tooltipText="" outgoingEdges="_08lj8GBxEeWUrY3nJWVIeg _3jn3oGBxEeWUrY3nJWVIeg _Jh4qoGL8EeW2rMch79jPxg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_wdcfIGBxEeWUrY3nJWVIeg" name="ConstantDefinition" tooltipText="" outgoingEdges="_08lj8GBxEeWUrY3nJWVIeg _3jn3oGBxEeWUrY3nJWVIeg _Jh4qoGL8EeW2rMch79jPxg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDefinition"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDefinition"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_wddtQGBxEeWUrY3nJWVIeg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_wddtQGBxEeWUrY3nJWVIeg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_08lj8GBxEeWUrY3nJWVIeg" sourceNode="_wdcfIGBxEeWUrY3nJWVIeg" targetNode="_bbsmkDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_08lj8GBxEeWUrY3nJWVIeg" sourceNode="_wdcfIGBxEeWUrY3nJWVIeg" targetNode="_bbsmkDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDefinition"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//ConstantDefinition/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_08mLAGBxEeWUrY3nJWVIeg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_08mLAGBxEeWUrY3nJWVIeg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_08mLAWBxEeWUrY3nJWVIeg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_08mLAWBxEeWUrY3nJWVIeg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_08mLAmBxEeWUrY3nJWVIeg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_08mLAmBxEeWUrY3nJWVIeg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_3jn3oGBxEeWUrY3nJWVIeg" name="[1..1] value" sourceNode="_wdcfIGBxEeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_3jn3oGBxEeWUrY3nJWVIeg" name="[1..1] value" sourceNode="_wdcfIGBxEeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//ConstantDefinition/value"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//ConstantDefinition/value"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_9cB1cGBxEeWUrY3nJWVIeg" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_9cB1cWBxEeWUrY3nJWVIeg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_9cB1cGBxEeWUrY3nJWVIeg" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_9cB1cWBxEeWUrY3nJWVIeg" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_9cB1cmBxEeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_9cB1cmBxEeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_JM3mQGByEeWUrY3nJWVIeg" name="RelationDefinition" tooltipText="" outgoingEdges="_y4FgIGByEeWUrY3nJWVIeg _vtC1kGB0EeWUrY3nJWVIeg _WpVCAGL8EeW2rMch79jPxg _dG1Q8GL8EeW2rMch79jPxg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_JM3mQGByEeWUrY3nJWVIeg" name="RelationDefinition" tooltipText="" outgoingEdges="_y4FgIGByEeWUrY3nJWVIeg _vtC1kGB0EeWUrY3nJWVIeg _WpVCAGL8EeW2rMch79jPxg _dG1Q8GL8EeW2rMch79jPxg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDefinition"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDefinition"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_JM3mQWByEeWUrY3nJWVIeg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_JM3mQWByEeWUrY3nJWVIeg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_y4FgIGByEeWUrY3nJWVIeg" name="[0..*] variables" sourceNode="_JM3mQGByEeWUrY3nJWVIeg" targetNode="_baynoDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_y4FgIGByEeWUrY3nJWVIeg" name="[0..*] variables" sourceNode="_JM3mQGByEeWUrY3nJWVIeg" targetNode="_baynoDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/variables"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/variables"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_fzp7AGB0EeWUrY3nJWVIeg" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_fzp7AWB0EeWUrY3nJWVIeg" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_fzp7AmB0EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_fzp7AGB0EeWUrY3nJWVIeg" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_fzp7AWB0EeWUrY3nJWVIeg" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_fzp7AmB0EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_vtC1kGB0EeWUrY3nJWVIeg" name="[1..1] value" sourceNode="_JM3mQGByEeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_vtC1kGB0EeWUrY3nJWVIeg" name="[1..1] value" sourceNode="_JM3mQGByEeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/value"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/value"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_wisrMGB0EeWUrY3nJWVIeg" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_wisrMWB0EeWUrY3nJWVIeg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_wisrMGB0EeWUrY3nJWVIeg" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_wisrMWB0EeWUrY3nJWVIeg" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_wisrMmB0EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_wisrMmB0EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_7R9DMGB0EeWUrY3nJWVIeg" name="FunctionDefinition" tooltipText="" outgoingEdges="_9x_-EGB0EeWUrY3nJWVIeg _CHDSwGB1EeWUrY3nJWVIeg _gHdJUGL8EeW2rMch79jPxg _wgcQsIV8EeWhkpx1k3JSIA" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_7R9DMGB0EeWUrY3nJWVIeg" name="FunctionDefinition" tooltipText="" outgoingEdges="_9x_-EGB0EeWUrY3nJWVIeg _CHDSwGB1EeWUrY3nJWVIeg _gHdJUGL8EeW2rMch79jPxg _wgcQsIV8EeWhkpx1k3JSIA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDefinition"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDefinition"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_7R9DMWB0EeWUrY3nJWVIeg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_7R9DMWB0EeWUrY3nJWVIeg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_9x_-EGB0EeWUrY3nJWVIeg" sourceNode="_7R9DMGB0EeWUrY3nJWVIeg" targetNode="_badQcDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_9x_-EGB0EeWUrY3nJWVIeg" sourceNode="_7R9DMGB0EeWUrY3nJWVIeg" targetNode="_badQcDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDefinition"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//FunctionDefinition/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_9x_-EWB0EeWUrY3nJWVIeg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_9x_-EWB0EeWUrY3nJWVIeg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_9x_-EmB0EeWUrY3nJWVIeg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_9x_-EmB0EeWUrY3nJWVIeg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_9x_-E2B0EeWUrY3nJWVIeg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_9x_-E2B0EeWUrY3nJWVIeg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_CHDSwGB1EeWUrY3nJWVIeg" name="[0..*] variable" sourceNode="_7R9DMGB0EeWUrY3nJWVIeg" targetNode="_baynoDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_CHDSwGB1EeWUrY3nJWVIeg" name="[0..*] variable" sourceNode="_7R9DMGB0EeWUrY3nJWVIeg" targetNode="_baynoDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/variable"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/variable"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_DF6uwGB1EeWUrY3nJWVIeg" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_DF6uwWB1EeWUrY3nJWVIeg" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_DF6uwmB1EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_DF6uwGB1EeWUrY3nJWVIeg" description="_bdKmMDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_DF6uwWB1EeWUrY3nJWVIeg" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_DF6uwmB1EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_LltJEGB2EeWUrY3nJWVIeg" name="IfThenElse" tooltipText="" outgoingEdges="_NuL4gGB2EeWUrY3nJWVIeg _RF40IGB2EeWUrY3nJWVIeg _SEkp8GB2EeWUrY3nJWVIeg _UrvggGB2EeWUrY3nJWVIeg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_LltJEGB2EeWUrY3nJWVIeg" name="IfThenElse" tooltipText="" outgoingEdges="_NuL4gGB2EeWUrY3nJWVIeg _RF40IGB2EeWUrY3nJWVIeg _SEkp8GB2EeWUrY3nJWVIeg _UrvggGB2EeWUrY3nJWVIeg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_LltwIGB2EeWUrY3nJWVIeg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_LltwIGB2EeWUrY3nJWVIeg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_NuL4gGB2EeWUrY3nJWVIeg" name="[1..1] condition" sourceNode="_LltJEGB2EeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_NuL4gGB2EeWUrY3nJWVIeg" name="[1..1] condition" sourceNode="_LltJEGB2EeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/condition"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/condition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_UIKSUGB2EeWUrY3nJWVIeg" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_UIKSUWB2EeWUrY3nJWVIeg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_UIKSUGB2EeWUrY3nJWVIeg" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_UIKSUWB2EeWUrY3nJWVIeg" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_UIKSUmB2EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_UIKSUmB2EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_RF40IGB2EeWUrY3nJWVIeg" sourceNode="_LltJEGB2EeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_RF40IGB2EeWUrY3nJWVIeg" sourceNode="_LltJEGB2EeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//IfThenElse/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_RF5bMGB2EeWUrY3nJWVIeg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_RF5bMGB2EeWUrY3nJWVIeg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_RF5bMWB2EeWUrY3nJWVIeg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_RF5bMWB2EeWUrY3nJWVIeg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_RF5bMmB2EeWUrY3nJWVIeg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_RF5bMmB2EeWUrY3nJWVIeg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_SEkp8GB2EeWUrY3nJWVIeg" name="[1..1] ifTrue" sourceNode="_LltJEGB2EeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_SEkp8GB2EeWUrY3nJWVIeg" name="[1..1] ifTrue" sourceNode="_LltJEGB2EeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifTrue"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifTrue"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_TZyJYGB2EeWUrY3nJWVIeg" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_TZyJYWB2EeWUrY3nJWVIeg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_TZyJYGB2EeWUrY3nJWVIeg" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_TZyJYWB2EeWUrY3nJWVIeg" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_TZyJYmB2EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_TZyJYmB2EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_UrvggGB2EeWUrY3nJWVIeg" name="[1..1] ifFalse" sourceNode="_LltJEGB2EeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_UrvggGB2EeWUrY3nJWVIeg" name="[1..1] ifFalse" sourceNode="_LltJEGB2EeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifFalse"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifFalse"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_WcH5AGB2EeWUrY3nJWVIeg" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_WcH5AWB2EeWUrY3nJWVIeg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_WcH5AGB2EeWUrY3nJWVIeg" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_WcH5AWB2EeWUrY3nJWVIeg" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_WcH5AmB2EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_WcH5AmB2EeWUrY3nJWVIeg" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_EpuB0GL8EeW2rMch79jPxg" name="ConstantDeclaration" tooltipText="" outgoingEdges="_Hjg5cGL8EeW2rMch79jPxg" incomingEdges="_Jh4qoGL8EeW2rMch79jPxg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_EpuB0GL8EeW2rMch79jPxg" name="ConstantDeclaration" tooltipText="" outgoingEdges="_Hjg5cGL8EeW2rMch79jPxg" incomingEdges="_Jh4qoGL8EeW2rMch79jPxg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDeclaration"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_EpvP8GL8EeW2rMch79jPxg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_EpvP8GL8EeW2rMch79jPxg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Hjg5cGL8EeW2rMch79jPxg" sourceNode="_EpuB0GL8EeW2rMch79jPxg" targetNode="_bbsmkDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Hjg5cGL8EeW2rMch79jPxg" sourceNode="_EpuB0GL8EeW2rMch79jPxg" targetNode="_bbsmkDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDeclaration"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//ConstantDeclaration/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_HjhggGL8EeW2rMch79jPxg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_HjhggGL8EeW2rMch79jPxg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_HjhggWL8EeW2rMch79jPxg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_HjhggWL8EeW2rMch79jPxg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_HjhggmL8EeW2rMch79jPxg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_HjhggmL8EeW2rMch79jPxg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Jh4qoGL8EeW2rMch79jPxg" name="[0..1] defines" sourceNode="_wdcfIGBxEeWUrY3nJWVIeg" targetNode="_EpuB0GL8EeW2rMch79jPxg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Jh4qoGL8EeW2rMch79jPxg" name="[0..1] defines" sourceNode="_wdcfIGBxEeWUrY3nJWVIeg" targetNode="_EpuB0GL8EeW2rMch79jPxg">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//ConstantDefinition/defines"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//ConstantDefinition/defines"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Jh5RsGL8EeW2rMch79jPxg" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Jh5RsGL8EeW2rMch79jPxg" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Jh5RsWL8EeW2rMch79jPxg" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Jh5RsWL8EeW2rMch79jPxg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_Jh5RsmL8EeW2rMch79jPxg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_Jh5RsmL8EeW2rMch79jPxg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MU49wGL8EeW2rMch79jPxg" name="RelationDeclaration" tooltipText="" outgoingEdges="_OYoXIGL8EeW2rMch79jPxg" incomingEdges="_dG1Q8GL8EeW2rMch79jPxg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MU49wGL8EeW2rMch79jPxg" name="RelationDeclaration" tooltipText="" outgoingEdges="_OYoXIGL8EeW2rMch79jPxg" incomingEdges="_dG1Q8GL8EeW2rMch79jPxg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MU49wWL8EeW2rMch79jPxg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MU49wWL8EeW2rMch79jPxg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_OYoXIGL8EeW2rMch79jPxg" sourceNode="_MU49wGL8EeW2rMch79jPxg" targetNode="_bbrYcDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OYoXIGL8EeW2rMch79jPxg" sourceNode="_MU49wGL8EeW2rMch79jPxg" targetNode="_bbrYcDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDeclaration"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//RelationDeclaration/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_OYoXIWL8EeW2rMch79jPxg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OYoXIWL8EeW2rMch79jPxg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_OYo-MGL8EeW2rMch79jPxg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OYo-MGL8EeW2rMch79jPxg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_OYo-MWL8EeW2rMch79jPxg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OYo-MWL8EeW2rMch79jPxg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_TUMSMGL8EeW2rMch79jPxg" name="FunctionDeclaration" tooltipText="" outgoingEdges="_VHCI0GL8EeW2rMch79jPxg" incomingEdges="_gHdJUGL8EeW2rMch79jPxg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_TUMSMGL8EeW2rMch79jPxg" name="FunctionDeclaration" tooltipText="" outgoingEdges="_VHCI0GL8EeW2rMch79jPxg" incomingEdges="_gHdJUGL8EeW2rMch79jPxg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_TUM5QGL8EeW2rMch79jPxg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_TUM5QGL8EeW2rMch79jPxg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_VHCI0GL8EeW2rMch79jPxg" sourceNode="_TUMSMGL8EeW2rMch79jPxg" targetNode="_badQcDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_VHCI0GL8EeW2rMch79jPxg" sourceNode="_TUMSMGL8EeW2rMch79jPxg" targetNode="_badQcDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDeclaration"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//FunctionDeclaration/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_VHCI0WL8EeW2rMch79jPxg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_VHCI0WL8EeW2rMch79jPxg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_VHCI0mL8EeW2rMch79jPxg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_VHCI0mL8EeW2rMch79jPxg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_VHCI02L8EeW2rMch79jPxg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_VHCI02L8EeW2rMch79jPxg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_WpVCAGL8EeW2rMch79jPxg" sourceNode="_JM3mQGByEeWUrY3nJWVIeg" targetNode="_bbrYcDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_WpVCAGL8EeW2rMch79jPxg" sourceNode="_JM3mQGByEeWUrY3nJWVIeg" targetNode="_bbrYcDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDefinition"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//RelationDefinition/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_WpVpEGL8EeW2rMch79jPxg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_WpVpEGL8EeW2rMch79jPxg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_WpVpEWL8EeW2rMch79jPxg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_WpVpEWL8EeW2rMch79jPxg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_WpVpEmL8EeW2rMch79jPxg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_WpVpEmL8EeW2rMch79jPxg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_dG1Q8GL8EeW2rMch79jPxg" name="[0..1] defines" sourceNode="_JM3mQGByEeWUrY3nJWVIeg" targetNode="_MU49wGL8EeW2rMch79jPxg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_dG1Q8GL8EeW2rMch79jPxg" name="[0..1] defines" sourceNode="_JM3mQGByEeWUrY3nJWVIeg" targetNode="_MU49wGL8EeW2rMch79jPxg">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/defines"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/defines"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_dG1Q8WL8EeW2rMch79jPxg" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dG1Q8WL8EeW2rMch79jPxg" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_dG14AGL8EeW2rMch79jPxg" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dG14AGL8EeW2rMch79jPxg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_dG14AWL8EeW2rMch79jPxg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_dG14AWL8EeW2rMch79jPxg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_gHdJUGL8EeW2rMch79jPxg" name="[0..1] defines" sourceNode="_7R9DMGB0EeWUrY3nJWVIeg" targetNode="_TUMSMGL8EeW2rMch79jPxg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_gHdJUGL8EeW2rMch79jPxg" name="[0..1] defines" sourceNode="_7R9DMGB0EeWUrY3nJWVIeg" targetNode="_TUMSMGL8EeW2rMch79jPxg">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/defines"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/defines"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_gHdwYGL8EeW2rMch79jPxg" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_gHdwYGL8EeW2rMch79jPxg" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_gHdwYWL8EeW2rMch79jPxg" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_gHdwYWL8EeW2rMch79jPxg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_gHdwYmL8EeW2rMch79jPxg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_gHdwYmL8EeW2rMch79jPxg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_XNsv8GPkEeWuQbyserbs4Q" name="TypeDeclaration" tooltipText="" outgoingEdges="_agR7AGPkEeWuQbyserbs4Q" incomingEdges="_dBnPUGPkEeWuQbyserbs4Q" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_XNsv8GPkEeWuQbyserbs4Q" name="TypeDeclaration" tooltipText="" outgoingEdges="_agR7AGPkEeWuQbyserbs4Q" incomingEdges="_dBnPUGPkEeWuQbyserbs4Q" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XNtXAGPkEeWuQbyserbs4Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_XNtXAGPkEeWuQbyserbs4Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_agR7AGPkEeWuQbyserbs4Q" sourceNode="_XNsv8GPkEeWuQbyserbs4Q" targetNode="_bZ1lYDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_agR7AGPkEeWuQbyserbs4Q" sourceNode="_XNsv8GPkEeWuQbyserbs4Q" targetNode="_bZ1lYDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDeclaration"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//TypeDeclaration/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_agSiEGPkEeWuQbyserbs4Q" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_agSiEGPkEeWuQbyserbs4Q" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_agSiEWPkEeWuQbyserbs4Q" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_agSiEWPkEeWuQbyserbs4Q" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_agSiEmPkEeWuQbyserbs4Q" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_agSiEmPkEeWuQbyserbs4Q" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_dBnPUGPkEeWuQbyserbs4Q" name="[0..1] defines" sourceNode="_baGEEDx1EeWiQ_wtFd6fGQ" targetNode="_XNsv8GPkEeWuQbyserbs4Q">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_dBnPUGPkEeWuQbyserbs4Q" name="[0..1] defines" sourceNode="_baGEEDx1EeWiQ_wtFd6fGQ" targetNode="_XNsv8GPkEeWuQbyserbs4Q">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//TypeDefinition/defines"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//TypeDefinition/defines"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_dBn2YGPkEeWuQbyserbs4Q" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dBn2YGPkEeWuQbyserbs4Q" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_dBn2YWPkEeWuQbyserbs4Q" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dBn2YWPkEeWuQbyserbs4Q" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_dBn2YmPkEeWuQbyserbs4Q" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_dBn2YmPkEeWuQbyserbs4Q" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_OLE8QIPKEeWOre-0TMCmMQ" sourceNode="_bZ1lYDx1EeWiQ_wtFd6fGQ" targetNode="_bZ1lYDx1EeWiQ_wtFd6fGQ" beginLabel="[0..*] supertypes" endLabel="[0..*] subtypes">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OLE8QIPKEeWOre-0TMCmMQ" sourceNode="_bZ1lYDx1EeWiQ_wtFd6fGQ" targetNode="_bZ1lYDx1EeWiQ_wtFd6fGQ" beginLabel="[0..*] supertypes" endLabel="[0..*] subtypes">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Type/subtypes"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Type/subtypes"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Type/supertypes"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_OLGKYIPKEeWOre-0TMCmMQ" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OLGKYIPKEeWOre-0TMCmMQ" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_OLGKYYPKEeWOre-0TMCmMQ" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_OLGKYoPKEeWOre-0TMCmMQ" showIcon="false"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OLGKYYPKEeWOre-0TMCmMQ" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OLGKYoPKEeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_wgcQsIV8EeWhkpx1k3JSIA" name="[1..1] value" sourceNode="_7R9DMGB0EeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_wgcQsIV8EeWhkpx1k3JSIA" name="[1..1] value" sourceNode="_7R9DMGB0EeWUrY3nJWVIeg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/value"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/value"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_wgde0IV8EeWhkpx1k3JSIA" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_wgde0YV8EeWhkpx1k3JSIA" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_wgde0IV8EeWhkpx1k3JSIA" description="_bd8CQDx1EeWiQ_wtFd6fGQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_wgde0YV8EeWhkpx1k3JSIA" showIcon="false">
           <customFeatures>labelSize</customFeatures>
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_wgde0oV8EeWhkpx1k3JSIA" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_wgde0oV8EeWhkpx1k3JSIA" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_OEz0UAGOEeaDEJmvhpl9gg" sourceNode="_baDn0Dx1EeWiQ_wtFd6fGQ" targetNode="_baGEEDx1EeWiQ_wtFd6fGQ" beginLabel="[0..*] elements" endLabel="[1..*] definedInType">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OEz0UAGOEeaDEJmvhpl9gg" sourceNode="_baDn0Dx1EeWiQ_wtFd6fGQ" targetNode="_baGEEDx1EeWiQ_wtFd6fGQ" beginLabel="[0..*] elements" endLabel="[1..*] definedInType">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//DefinedElement/definedInType"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//DefinedElement/definedInType"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//TypeDefinition/elements"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_OE1CcAGOEeaDEJmvhpl9gg" description="_OE0bYAGOEeaDEJmvhpl9gg" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_OE1CcQGOEeaDEJmvhpl9gg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OE1CcAGOEeaDEJmvhpl9gg" description="_OE0bYAGOEeaDEJmvhpl9gg" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OE1CcQGOEeaDEJmvhpl9gg" showIcon="false">
           <labelFormat>bold</labelFormat>
         </beginLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_OE1CcgGOEeaDEJmvhpl9gg" showIcon="false">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OE1CcgGOEeaDEJmvhpl9gg" showIcon="false">
           <labelFormat>bold</labelFormat>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_QmrUIAGOEeaDEJmvhpl9gg" name="UnknownBecauseUninterpreted" tooltipText="" outgoingEdges="_X9kCIAGOEeaDEJmvhpl9gg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_QmrUIAGOEeaDEJmvhpl9gg" name="UnknownBecauseUninterpreted" tooltipText="" outgoingEdges="_X9kCIAGOEeaDEJmvhpl9gg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//UnknownBecauseUninterpreted"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//UnknownBecauseUninterpreted"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_QmsiQAGOEeaDEJmvhpl9gg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_QmsiQAGOEeaDEJmvhpl9gg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_X9kCIAGOEeaDEJmvhpl9gg" sourceNode="_QmrUIAGOEeaDEJmvhpl9gg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_X9kCIAGOEeaDEJmvhpl9gg" sourceNode="_QmrUIAGOEeaDEJmvhpl9gg" targetNode="_bafssDx1EeWiQ_wtFd6fGQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//UnknownBecauseUninterpreted"/>
       <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//UnknownBecauseUninterpreted/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_X9kpMAGOEeaDEJmvhpl9gg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_X9kpMAGOEeaDEJmvhpl9gg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_X9kpMQGOEeaDEJmvhpl9gg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_X9kpMQGOEeaDEJmvhpl9gg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_X9kpMgGOEeaDEJmvhpl9gg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_X9kpMgGOEeaDEJmvhpl9gg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_XL9PtTx1EeWiQ_wtFd6fGQ"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_XL9PtTx1EeWiQ_wtFd6fGQ"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
     <target xmi:type="ecore:EPackage" href="logiclanguage.ecore#/"/>
   </diagram:DSemanticDiagram>
-  <diagram:DSemanticDiagram xmi:id="_veq9MGCGEeWg-_mfCA72gg" name="logicproblem class diagram" uid="_TC2lsG7rEeifqZoaQeIEkw">
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_veq9MWCGEeWg-_mfCA72gg" source="DANNOTATION_CUSTOMIZATION_KEY">
-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_veq9MmCGEeWg-_mfCA72gg">
+  <diagram:DSemanticDiagram uid="_veq9MGCGEeWg-_mfCA72gg" name="logicproblem class diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_veq9MWCGEeWg-_mfCA72gg" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_veq9MmCGEeWg-_mfCA72gg">
         <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan">
           <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_w24tUWCGEeWg-_mfCA72gg" showIcon="false" labelExpression="service:render">
@@ -3913,24 +3913,23 @@
           <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
         </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_XtkzkMDnEea_b6UyFzv22g" sourceArrow="InputArrow" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_XtkzkcDnEea_b6UyFzv22g" showIcon="false" labelExpression="service:renderEOpposite">
-            <labelFormat>bold</labelFormat>
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </beginLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_XtkzksDnEea_b6UyFzv22g" showIcon="false" labelExpression="service:render">
-            <labelFormat>bold</labelFormat>
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </endLabelStyleDescription>
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_03EEIm6hEemSyfDlsGAqLA" labelExpression="service:renderAsNode" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
         </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_ve6NwGCGEeWg-_mfCA72gg" source="GMF_DIAGRAMS">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_ve6NwGCGEeWg-_mfCA72gg" source="GMF_DIAGRAMS">
       <data xmi:type="notation:Diagram" xmi:id="_ve6NwWCGEeWg-_mfCA72gg" type="Sirius" element="_veq9MGCGEeWg-_mfCA72gg" measurementUnit="Pixel">
         <children xmi:type="notation:Node" xmi:id="_w2-M4GCGEeWg-_mfCA72gg" type="2003" element="_w2mZcGCGEeWg-_mfCA72gg">
           <children xmi:type="notation:Node" xmi:id="_w2_bAGCGEeWg-_mfCA72gg" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_w3ApIGCGEeWg-_mfCA72gg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_03RfgG6hEemSyfDlsGAqLA" type="3010" element="_03DdEm6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_03RfgW6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_03Rfgm6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_w3ApIWCGEeWg-_mfCA72gg"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_w3ApImCGEeWg-_mfCA72gg"/>
           </children>
@@ -3944,6 +3943,10 @@
               <styles xmi:type="notation:FontStyle" xmi:id="_3QZ0IWCGEeWg-_mfCA72gg" fontName="Segoe UI" fontHeight="8" bold="true"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_3QZ0ImCGEeWg-_mfCA72gg"/>
             </children>
+            <children xmi:type="notation:Node" xmi:id="_03Rfg26hEemSyfDlsGAqLA" type="3010" element="_03EEIW6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_03RfhG6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_03RfhW6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_3QVismCGEeWg-_mfCA72gg"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_3QVis2CGEeWg-_mfCA72gg"/>
           </children>
@@ -3953,6 +3956,10 @@
         <children xmi:type="notation:Node" xmi:id="_3QVitGCGEeWg-_mfCA72gg" type="2003" element="_3P1zcGCGEeWg-_mfCA72gg">
           <children xmi:type="notation:Node" xmi:id="_3QWJwGCGEeWg-_mfCA72gg" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_3QWJwWCGEeWg-_mfCA72gg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_03SGkG6hEemSyfDlsGAqLA" type="3010" element="_03ErMG6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_03SGkW6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_03SGkm6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_3QWJwmCGEeWg-_mfCA72gg"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_3QWJw2CGEeWg-_mfCA72gg"/>
           </children>
@@ -3962,6 +3969,14 @@
         <children xmi:type="notation:Node" xmi:id="_3QWw0GCGEeWg-_mfCA72gg" type="2003" element="_3P3BkGCGEeWg-_mfCA72gg">
           <children xmi:type="notation:Node" xmi:id="_3QWw02CGEeWg-_mfCA72gg" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_3QWw1GCGEeWg-_mfCA72gg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_03SGk26hEemSyfDlsGAqLA" type="3010" element="_03FSQG6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_03SGlG6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_03SGlW6hEemSyfDlsGAqLA"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_03StoG6hEemSyfDlsGAqLA" type="3010" element="_03FSQm6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_03StoW6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_03Stom6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_3QWw1WCGEeWg-_mfCA72gg"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_3QWw1mCGEeWg-_mfCA72gg"/>
           </children>
@@ -3971,6 +3986,10 @@
         <children xmi:type="notation:Node" xmi:id="_3QXX4GCGEeWg-_mfCA72gg" type="2003" element="_3P4PsGCGEeWg-_mfCA72gg">
           <children xmi:type="notation:Node" xmi:id="_3QXX42CGEeWg-_mfCA72gg" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_3QYmAGCGEeWg-_mfCA72gg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_03Sto26hEemSyfDlsGAqLA" type="3010" element="_03F5UG6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_03StpG6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_03StpW6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_3QYmAWCGEeWg-_mfCA72gg"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_3QYmAmCGEeWg-_mfCA72gg"/>
           </children>
@@ -3997,6 +4016,10 @@
         <children xmi:type="notation:Node" xmi:id="_GffWQIcPEeWhkpx1k3JSIA" type="2003" element="_GfTJAIcPEeWhkpx1k3JSIA">
           <children xmi:type="notation:Node" xmi:id="_Gff9UIcPEeWhkpx1k3JSIA" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_Gff9UYcPEeWhkpx1k3JSIA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_03Stpm6hEemSyfDlsGAqLA" type="3010" element="_03HHcG6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_03Stp26hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_03StqG6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_Gff9UocPEeWhkpx1k3JSIA"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_Gff9U4cPEeWhkpx1k3JSIA"/>
           </children>
@@ -4240,464 +4263,508 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_48kNkrw9Eeaj7tVusjQpHg" id="(0.5,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_48kNk7w9Eeaj7tVusjQpHg" id="(0.0,0.2926829268292683)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_ichmYMDjEea_b6UyFzv22g" type="4001" element="_iboOgMDjEea_b6UyFzv22g" source="_p34i4Lw8Eeaj7tVusjQpHg" target="_3QVitGCGEeWg-_mfCA72gg">
-          <children xmi:type="notation:Node" xmi:id="_icqwUMDjEea_b6UyFzv22g" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_icqwUcDjEea_b6UyFzv22g" y="-10"/>
+        <edges xmi:type="notation:Edge" xmi:id="_03Ui0G6hEemSyfDlsGAqLA" type="4001" element="_03MnBm6hEemSyfDlsGAqLA" source="_3QXX4GCGEeWg-_mfCA72gg" target="_hJrcoLw8Eeaj7tVusjQpHg">
+          <children xmi:type="notation:Node" xmi:id="_03Ui1G6hEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03Ui1W6hEemSyfDlsGAqLA" y="-10"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_icr-cMDjEea_b6UyFzv22g" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_icr-ccDjEea_b6UyFzv22g" y="10"/>
+          <children xmi:type="notation:Node" xmi:id="_03Ui1m6hEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03Ui126hEemSyfDlsGAqLA" y="10"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_ictMkMDjEea_b6UyFzv22g" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ictMkcDjEea_b6UyFzv22g" y="10"/>
+          <children xmi:type="notation:Node" xmi:id="_03Ui2G6hEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03Ui2W6hEemSyfDlsGAqLA" y="10"/>
           </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ichmYcDjEea_b6UyFzv22g" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_ichmYsDjEea_b6UyFzv22g" fontName="Segoe UI" fontHeight="8" bold="true"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ichmY8DjEea_b6UyFzv22g" points="[-11, -19, 40, 71]$[-11, -89, 40, 1]$[-50, -89, 1, 1]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_icyFEMDjEea_b6UyFzv22g" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_icyFEcDjEea_b6UyFzv22g" id="(0.5,0.5)"/>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_03Ui0W6hEemSyfDlsGAqLA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_03Ui0m6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_03Ui026hEemSyfDlsGAqLA" points="[1, 0, -60, -71]$[31, 0, -30, -71]$[31, 71, -30, 0]$[61, 71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_03VJ4G6hEemSyfDlsGAqLA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_03VJ4W6hEemSyfDlsGAqLA" id="(0.5,0.5)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_jkTGwMDjEea_b6UyFzv22g" type="4001" element="_jjvtIMDjEea_b6UyFzv22g" source="_hJrcoLw8Eeaj7tVusjQpHg" target="_3QXX4GCGEeWg-_mfCA72gg">
-          <children xmi:type="notation:Node" xmi:id="_jkTt0MDjEea_b6UyFzv22g" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkTt0cDjEea_b6UyFzv22g" y="-10"/>
+        <edges xmi:type="notation:Edge" xmi:id="_03WYAG6hEemSyfDlsGAqLA" type="4001" element="_03N1IG6hEemSyfDlsGAqLA" source="_3QVitGCGEeWg-_mfCA72gg" target="_p34i4Lw8Eeaj7tVusjQpHg">
+          <children xmi:type="notation:Node" xmi:id="_03W_EG6hEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03W_EW6hEemSyfDlsGAqLA" y="-10"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_jkTt0sDjEea_b6UyFzv22g" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkTt08DjEea_b6UyFzv22g" y="10"/>
+          <children xmi:type="notation:Node" xmi:id="_03XmIG6hEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03XmIW6hEemSyfDlsGAqLA" y="10"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_jkTt1MDjEea_b6UyFzv22g" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkTt1cDjEea_b6UyFzv22g" y="10"/>
+          <children xmi:type="notation:Node" xmi:id="_03YNMG6hEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03YNMW6hEemSyfDlsGAqLA" y="10"/>
           </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_jkTGwcDjEea_b6UyFzv22g" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_jkTGwsDjEea_b6UyFzv22g" fontName="Segoe UI" fontHeight="8" bold="true"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jkTGw8DjEea_b6UyFzv22g" points="[-14, -21, 47, 71]$[-14, -91, 47, 1]$[-60, -91, 1, 1]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkTt1sDjEea_b6UyFzv22g" id="(0.5,0.4883720930232558)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkTt18DjEea_b6UyFzv22g" id="(0.5,0.5)"/>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_03WYAW6hEemSyfDlsGAqLA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_03WYAm6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_03WYA26hEemSyfDlsGAqLA" points="[1, 0, -50, -90]$[20, 0, -31, -90]$[20, 90, -31, 0]$[40, 90, -11, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_03YNMm6hEemSyfDlsGAqLA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_03YNM26hEemSyfDlsGAqLA" id="(0.5,0.5)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_kiyvUMDjEea_b6UyFzv22g" type="4001" element="_kiXRgMDjEea_b6UyFzv22g" source="_t5HjsLw8Eeaj7tVusjQpHg" target="_3QWw0GCGEeWg-_mfCA72gg">
-          <children xmi:type="notation:Node" xmi:id="_kizWYMDjEea_b6UyFzv22g" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kizWYcDjEea_b6UyFzv22g" y="-10"/>
+        <edges xmi:type="notation:Edge" xmi:id="_03Y0QG6hEemSyfDlsGAqLA" type="4001" element="_03OcMG6hEemSyfDlsGAqLA" source="_3QWw0GCGEeWg-_mfCA72gg" target="_t5HjsLw8Eeaj7tVusjQpHg">
+          <children xmi:type="notation:Node" xmi:id="_03Y0RG6hEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03Y0RW6hEemSyfDlsGAqLA" y="-10"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_kizWYsDjEea_b6UyFzv22g" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kizWY8DjEea_b6UyFzv22g" y="10"/>
+          <children xmi:type="notation:Node" xmi:id="_03ZbUG6hEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03ZbUW6hEemSyfDlsGAqLA" y="10"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_kiz9cMDjEea_b6UyFzv22g" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kiz9ccDjEea_b6UyFzv22g" y="10"/>
+          <children xmi:type="notation:Node" xmi:id="_03ZbUm6hEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03ZbU26hEemSyfDlsGAqLA" y="10"/>
           </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_kiyvUcDjEea_b6UyFzv22g" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_kiyvUsDjEea_b6UyFzv22g" fontName="Segoe UI" fontHeight="8" bold="true"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kiyvU8DjEea_b6UyFzv22g" points="[-16, -21, 51, 71]$[-16, -91, 51, 1]$[-66, -91, 1, 1]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kiz9csDjEea_b6UyFzv22g" id="(0.49624060150375937,0.4883720930232558)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kiz9c8DjEea_b6UyFzv22g" id="(0.5,0.5)"/>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_03Y0QW6hEemSyfDlsGAqLA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_03Y0Qm6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_03Y0Q26hEemSyfDlsGAqLA" points="[1, 0, -45, -71]$[23, 0, -23, -71]$[23, 71, -23, 0]$[46, 71, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_03ZbVG6hEemSyfDlsGAqLA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_03ZbVW6hEemSyfDlsGAqLA" id="(0.5,0.5)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_XtsIUMDnEea_b6UyFzv22g" type="4001" element="_XtnP0MDnEea_b6UyFzv22g" source="_yw2usLw8Eeaj7tVusjQpHg" target="_3QU7oGCGEeWg-_mfCA72gg">
-          <children xmi:type="notation:Node" xmi:id="_XtsIVMDnEea_b6UyFzv22g" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XtsIVcDnEea_b6UyFzv22g" y="-10"/>
+        <edges xmi:type="notation:Edge" xmi:id="_03ZbVm6hEemSyfDlsGAqLA" type="4001" element="_03PDQG6hEemSyfDlsGAqLA" source="_3QU7oGCGEeWg-_mfCA72gg" target="_yw2usLw8Eeaj7tVusjQpHg">
+          <children xmi:type="notation:Node" xmi:id="_03ZbWm6hEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03ZbW26hEemSyfDlsGAqLA" y="-10"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_XtsIVsDnEea_b6UyFzv22g" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XtsIV8DnEea_b6UyFzv22g" y="10"/>
+          <children xmi:type="notation:Node" xmi:id="_03ZbXG6hEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03ZbXW6hEemSyfDlsGAqLA" y="10"/>
           </children>
-          <children xmi:type="notation:Node" xmi:id="_XtsIWMDnEea_b6UyFzv22g" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XtsIWcDnEea_b6UyFzv22g" y="10"/>
+          <children xmi:type="notation:Node" xmi:id="_03ZbXm6hEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03aCYG6hEemSyfDlsGAqLA" y="10"/>
           </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_XtsIUcDnEea_b6UyFzv22g" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_XtsIUsDnEea_b6UyFzv22g" fontName="Segoe UI" fontHeight="8" bold="true"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XtsIU8DnEea_b6UyFzv22g" points="[-10, -19, 59, 126]$[-10, -143, 59, 2]$[-68, -143, 1, 2]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtsvYMDnEea_b6UyFzv22g" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XtsvYcDnEea_b6UyFzv22g" id="(0.5,0.5)"/>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_03ZbV26hEemSyfDlsGAqLA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_03ZbWG6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_03ZbWW6hEemSyfDlsGAqLA" points="[1, 0, -68, -145]$[30, 0, -39, -145]$[30, 145, -39, 0]$[59, 145, -10, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_03aCYW6hEemSyfDlsGAqLA" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_03aCYm6hEemSyfDlsGAqLA" id="(0.5,0.5)"/>
         </edges>
       </data>
     </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_w2mZcGCGEeWg-_mfCA72gg" name="LogicProblem" tooltipText="" outgoingEdges="_3QLKoGCGEeWg-_mfCA72gg _3QMYwGCGEeWg-_mfCA72gg _3QM_02CGEeWg-_mfCA72gg _3QON8GCGEeWg-_mfCA72gg _3QPcEGCGEeWg-_mfCA72gg _It8x4IcPEeWhkpx1k3JSIA _yzbFELw9Eeaj7tVusjQpHg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_w2mZcGCGEeWg-_mfCA72gg" name="LogicProblem" tooltipText="" outgoingEdges="_3QLKoGCGEeWg-_mfCA72gg _3QMYwGCGEeWg-_mfCA72gg _3QM_02CGEeWg-_mfCA72gg _3QON8GCGEeWg-_mfCA72gg _3QPcEGCGEeWg-_mfCA72gg _It8x4IcPEeWhkpx1k3JSIA _yzbFELw9Eeaj7tVusjQpHg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicproblem.ecore#//LogicProblem"/>
       <semanticElements xmi:type="ecore:EClass" href="logicproblem.ecore#//LogicProblem"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_w2o1sGCGEeWg-_mfCA72gg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_w2o1sGCGEeWg-_mfCA72gg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_03DdEm6hEemSyfDlsGAqLA" name=" containmentHierarchies : ContainmentHierarchy" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/containmentHierarchies"/>
+        <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/containmentHierarchies"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_03DdE26hEemSyfDlsGAqLA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_3Pz-QGCGEeWg-_mfCA72gg" name="Assertion" tooltipText="" incomingEdges="_3QM_02CGEeWg-_mfCA72gg _XtnP0MDnEea_b6UyFzv22g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3Pz-QGCGEeWg-_mfCA72gg" name="Assertion" tooltipText="" outgoingEdges="_03PDQG6hEemSyfDlsGAqLA" incomingEdges="_3QM_02CGEeWg-_mfCA72gg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Assertion"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Assertion"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_3QHgQGCGEeWg-_mfCA72gg">
+      <decorations xmi:type="viewpoint:Decoration" uid="_3QHgQGCGEeWg-_mfCA72gg">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_3P0lUGCGEeWg-_mfCA72gg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_3P0lUGCGEeWg-_mfCA72gg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_3QD14GCGEeWg-_mfCA72gg" name="name : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_3QD14GCGEeWg-_mfCA72gg" name="name : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Assertion/name"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Assertion/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3QEc8WCGEeWg-_mfCA72gg" labelAlignment="LEFT" description="_3QEc8GCGEeWg-_mfCA72gg">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_3QEc8WCGEeWg-_mfCA72gg" labelAlignment="LEFT" description="_3QEc8GCGEeWg-_mfCA72gg">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_03EEIW6hEemSyfDlsGAqLA" name=" value : Term" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Assertion/value"/>
+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Assertion/value"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_03EEI26hEemSyfDlsGAqLA" labelAlignment="LEFT" description="_03EEIm6hEemSyfDlsGAqLA" color="114,159,207">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_3P1zcGCGEeWg-_mfCA72gg" name="Constant" tooltipText="" incomingEdges="_3QPcEGCGEeWg-_mfCA72gg _iboOgMDjEea_b6UyFzv22g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3P1zcGCGEeWg-_mfCA72gg" name="Constant" tooltipText="" outgoingEdges="_03N1IG6hEemSyfDlsGAqLA" incomingEdges="_3QPcEGCGEeWg-_mfCA72gg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Constant"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Constant"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_3QHgQWCGEeWg-_mfCA72gg">
+      <decorations xmi:type="viewpoint:Decoration" uid="_3QHgQWCGEeWg-_mfCA72gg">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_X75HgIP1EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_X75HgIP1EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_03ErMG6hEemSyfDlsGAqLA" name=" type : TypeReference" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/type"/>
+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/type"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_03ErMW6hEemSyfDlsGAqLA" labelAlignment="LEFT" description="_03EEIm6hEemSyfDlsGAqLA" color="114,159,207">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_3P3BkGCGEeWg-_mfCA72gg" name="Function" tooltipText="" incomingEdges="_3QMYwGCGEeWg-_mfCA72gg _kiXRgMDjEea_b6UyFzv22g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3P3BkGCGEeWg-_mfCA72gg" name="Function" tooltipText="" outgoingEdges="_03OcMG6hEemSyfDlsGAqLA" incomingEdges="_3QMYwGCGEeWg-_mfCA72gg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Function"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Function"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_3QHgQmCGEeWg-_mfCA72gg">
+      <decorations xmi:type="viewpoint:Decoration" uid="_3QHgQmCGEeWg-_mfCA72gg">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_X75ukIP1EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_X75ukIP1EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_03FSQG6hEemSyfDlsGAqLA" name=" range : TypeReference" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/range"/>
+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/range"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_03FSQW6hEemSyfDlsGAqLA" labelAlignment="LEFT" description="_03EEIm6hEemSyfDlsGAqLA" color="114,159,207">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_03FSQm6hEemSyfDlsGAqLA" name=" parameters : TypeReference" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/parameters"/>
+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/parameters"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_03FSQ26hEemSyfDlsGAqLA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_3P4PsGCGEeWg-_mfCA72gg" name="Relation" tooltipText="" incomingEdges="_3QON8GCGEeWg-_mfCA72gg _jjvtIMDjEea_b6UyFzv22g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3P4PsGCGEeWg-_mfCA72gg" name="Relation" tooltipText="" outgoingEdges="_03MnBm6hEemSyfDlsGAqLA" incomingEdges="_3QON8GCGEeWg-_mfCA72gg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_3QHgQ2CGEeWg-_mfCA72gg">
+      <decorations xmi:type="viewpoint:Decoration" uid="_3QHgQ2CGEeWg-_mfCA72gg">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_X75ukYP1EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_X75ukYP1EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_03F5UG6hEemSyfDlsGAqLA" name=" parameters : TypeReference" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/parameters"/>
+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/parameters"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_03F5UW6hEemSyfDlsGAqLA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_3P5d0GCGEeWg-_mfCA72gg" name="Type" tooltipText="" outgoingEdges="_X7-AAIP1EeWOre-0TMCmMQ" incomingEdges="_3QLKoGCGEeWg-_mfCA72gg _X7-AAIP1EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3P5d0GCGEeWg-_mfCA72gg" name="Type" tooltipText="" outgoingEdges="_X7-AAIP1EeWOre-0TMCmMQ" incomingEdges="_3QLKoGCGEeWg-_mfCA72gg _X7-AAIP1EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Type"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Type"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_3QIHUGCGEeWg-_mfCA72gg">
+      <decorations xmi:type="viewpoint:Decoration" uid="_3QIHUGCGEeWg-_mfCA72gg">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_X75ukoP1EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_X75ukoP1EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_3QFrEGCGEeWg-_mfCA72gg" name="name : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_3QFrEGCGEeWg-_mfCA72gg" name="name : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/name"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_3QGSIGCGEeWg-_mfCA72gg" labelAlignment="LEFT" description="_3QEc8GCGEeWg-_mfCA72gg">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_3QGSIGCGEeWg-_mfCA72gg" labelAlignment="LEFT" description="_3QEc8GCGEeWg-_mfCA72gg">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_KtsukAGOEeaDEJmvhpl9gg" name="isAbstract : EBoolean = false" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_KtsukAGOEeaDEJmvhpl9gg" name="isAbstract : EBoolean = false" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/isAbstract"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/isAbstract"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Ktt8sAGOEeaDEJmvhpl9gg" labelAlignment="LEFT" description="_3QEc8GCGEeWg-_mfCA72gg">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_Ktt8sAGOEeaDEJmvhpl9gg" labelAlignment="LEFT" description="_3QEc8GCGEeWg-_mfCA72gg">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_3QLKoGCGEeWg-_mfCA72gg" name="[0..*] types" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_3P5d0GCGEeWg-_mfCA72gg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_3QLKoGCGEeWg-_mfCA72gg" name="[0..*] types" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_3P5d0GCGEeWg-_mfCA72gg">
       <target xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/types"/>
       <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/types"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_3QLxsGCGEeWg-_mfCA72gg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_3QLxsWCGEeWg-_mfCA72gg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_3QLxsGCGEeWg-_mfCA72gg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_3QLxsWCGEeWg-_mfCA72gg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_3QLxsmCGEeWg-_mfCA72gg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_3QLxsmCGEeWg-_mfCA72gg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_3QMYwGCGEeWg-_mfCA72gg" name="[0..*] functions" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_3P3BkGCGEeWg-_mfCA72gg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_3QMYwGCGEeWg-_mfCA72gg" name="[0..*] functions" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_3P3BkGCGEeWg-_mfCA72gg">
       <target xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/functions"/>
       <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/functions"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_3QM_0GCGEeWg-_mfCA72gg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_3QM_0WCGEeWg-_mfCA72gg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_3QM_0GCGEeWg-_mfCA72gg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_3QM_0WCGEeWg-_mfCA72gg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_3QM_0mCGEeWg-_mfCA72gg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_3QM_0mCGEeWg-_mfCA72gg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_3QM_02CGEeWg-_mfCA72gg" name="[0..*] assertions" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_3Pz-QGCGEeWg-_mfCA72gg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_3QM_02CGEeWg-_mfCA72gg" name="[0..*] assertions" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_3Pz-QGCGEeWg-_mfCA72gg">
       <target xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/assertions"/>
       <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/assertions"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_3QNm4GCGEeWg-_mfCA72gg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_3QNm4WCGEeWg-_mfCA72gg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_3QNm4GCGEeWg-_mfCA72gg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_3QNm4WCGEeWg-_mfCA72gg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_3QNm4mCGEeWg-_mfCA72gg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_3QNm4mCGEeWg-_mfCA72gg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_3QON8GCGEeWg-_mfCA72gg" name="[0..*] relations" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_3P4PsGCGEeWg-_mfCA72gg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_3QON8GCGEeWg-_mfCA72gg" name="[0..*] relations" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_3P4PsGCGEeWg-_mfCA72gg">
       <target xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/relations"/>
       <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/relations"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_3QO1AGCGEeWg-_mfCA72gg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_3QO1AWCGEeWg-_mfCA72gg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_3QO1AGCGEeWg-_mfCA72gg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_3QO1AWCGEeWg-_mfCA72gg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_3QO1AmCGEeWg-_mfCA72gg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_3QO1AmCGEeWg-_mfCA72gg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_3QPcEGCGEeWg-_mfCA72gg" name="[0..*] constants" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_3P1zcGCGEeWg-_mfCA72gg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_3QPcEGCGEeWg-_mfCA72gg" name="[0..*] constants" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_3P1zcGCGEeWg-_mfCA72gg">
       <target xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/constants"/>
       <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/constants"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_3QQDIGCGEeWg-_mfCA72gg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_3QQDIWCGEeWg-_mfCA72gg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_3QQDIGCGEeWg-_mfCA72gg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_3QQDIWCGEeWg-_mfCA72gg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_3QQDImCGEeWg-_mfCA72gg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_3QQDImCGEeWg-_mfCA72gg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_X7-AAIP1EeWOre-0TMCmMQ" visible="false" sourceNode="_3P5d0GCGEeWg-_mfCA72gg" targetNode="_3P5d0GCGEeWg-_mfCA72gg" beginLabel="[0..*] supertypes" endLabel="[0..*] subtypes">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_X7-AAIP1EeWOre-0TMCmMQ" visible="false" sourceNode="_3P5d0GCGEeWg-_mfCA72gg" targetNode="_3P5d0GCGEeWg-_mfCA72gg" beginLabel="[0..*] supertypes" endLabel="[0..*] subtypes">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Type/subtypes"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Type/subtypes"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Type/supertypes"/>
-      <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_n-kQ0Lw8Eeaj7tVusjQpHg"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_X7-nEIP1EeWOre-0TMCmMQ" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+      <graphicalFilters xmi:type="diagram:HideFilter" uid="_n-kQ0Lw8Eeaj7tVusjQpHg"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_X7-nEIP1EeWOre-0TMCmMQ" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_X7-nEYP1EeWOre-0TMCmMQ" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_X7-nEoP1EeWOre-0TMCmMQ" showIcon="false"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_X7-nEYP1EeWOre-0TMCmMQ" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_X7-nEoP1EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_GfTJAIcPEeWhkpx1k3JSIA" name="DefinedElement" tooltipText="" incomingEdges="_It8x4IcPEeWhkpx1k3JSIA" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GfTJAIcPEeWhkpx1k3JSIA" name="DefinedElement" tooltipText="" incomingEdges="_It8x4IcPEeWhkpx1k3JSIA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_GfadwIcPEeWhkpx1k3JSIA">
+      <decorations xmi:type="viewpoint:Decoration" uid="_GfadwIcPEeWhkpx1k3JSIA">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_GfUXIIcPEeWhkpx1k3JSIA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_GfUXIIcPEeWhkpx1k3JSIA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_03HHcG6hEemSyfDlsGAqLA" name=" definedInType : TypeDefinition" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//DefinedElement/definedInType"/>
+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//DefinedElement/definedInType"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_03HHcW6hEemSyfDlsGAqLA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_It8x4IcPEeWhkpx1k3JSIA" name="[0..*] elements" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_GfTJAIcPEeWhkpx1k3JSIA">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_It8x4IcPEeWhkpx1k3JSIA" name="[0..*] elements" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_GfTJAIcPEeWhkpx1k3JSIA">
       <target xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/elements"/>
       <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/elements"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_K-GPkIcPEeWhkpx1k3JSIA" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_K-GPkYcPEeWhkpx1k3JSIA" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_K-GPkocPEeWhkpx1k3JSIA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_K-GPkIcPEeWhkpx1k3JSIA" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_K-GPkYcPEeWhkpx1k3JSIA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_K-GPkocPEeWhkpx1k3JSIA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_hJDKgLw8Eeaj7tVusjQpHg" name="RelationAnnotation" tooltipText="" outgoingEdges="_3uiUMLw9Eeaj7tVusjQpHg _jjvtIMDjEea_b6UyFzv22g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_hJDKgLw8Eeaj7tVusjQpHg" name="RelationAnnotation" tooltipText="" outgoingEdges="_3uiUMLw9Eeaj7tVusjQpHg" incomingEdges="_03MnBm6hEemSyfDlsGAqLA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicproblem.ecore#//RelationAnnotation"/>
       <semanticElements xmi:type="ecore:EClass" href="logicproblem.ecore#//RelationAnnotation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XtYmUMDnEea_b6UyFzv22g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_XtYmUMDnEea_b6UyFzv22g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_p3bP4Lw8Eeaj7tVusjQpHg" name="ConstantAnnotation" tooltipText="" outgoingEdges="_48R5sLw9Eeaj7tVusjQpHg _iboOgMDjEea_b6UyFzv22g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_p3bP4Lw8Eeaj7tVusjQpHg" name="ConstantAnnotation" tooltipText="" outgoingEdges="_48R5sLw9Eeaj7tVusjQpHg" incomingEdges="_03N1IG6hEemSyfDlsGAqLA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicproblem.ecore#//ConstantAnnotation"/>
       <semanticElements xmi:type="ecore:EClass" href="logicproblem.ecore#//ConstantAnnotation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XtZNYMDnEea_b6UyFzv22g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_XtZNYMDnEea_b6UyFzv22g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_t4w-YLw8Eeaj7tVusjQpHg" name="FunctionAnnotation" tooltipText="" outgoingEdges="_12OHsLw9Eeaj7tVusjQpHg _kiXRgMDjEea_b6UyFzv22g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_t4w-YLw8Eeaj7tVusjQpHg" name="FunctionAnnotation" tooltipText="" outgoingEdges="_12OHsLw9Eeaj7tVusjQpHg" incomingEdges="_03OcMG6hEemSyfDlsGAqLA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicproblem.ecore#//FunctionAnnotation"/>
       <semanticElements xmi:type="ecore:EClass" href="logicproblem.ecore#//FunctionAnnotation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XtZ0cMDnEea_b6UyFzv22g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_XtZ0cMDnEea_b6UyFzv22g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_ywfiULw8Eeaj7tVusjQpHg" name="AssertionAnnotation" tooltipText="" outgoingEdges="_0y2mMLw9Eeaj7tVusjQpHg _XtnP0MDnEea_b6UyFzv22g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ywfiULw8Eeaj7tVusjQpHg" name="AssertionAnnotation" tooltipText="" outgoingEdges="_0y2mMLw9Eeaj7tVusjQpHg" incomingEdges="_03PDQG6hEemSyfDlsGAqLA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicproblem.ecore#//AssertionAnnotation"/>
       <semanticElements xmi:type="ecore:EClass" href="logicproblem.ecore#//AssertionAnnotation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ywgJYLw8Eeaj7tVusjQpHg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ywgJYLw8Eeaj7tVusjQpHg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_sCN3ALw9Eeaj7tVusjQpHg" name="Annotation" tooltipText="" incomingEdges="_yzbFELw9Eeaj7tVusjQpHg _0y2mMLw9Eeaj7tVusjQpHg _12OHsLw9Eeaj7tVusjQpHg _3uiUMLw9Eeaj7tVusjQpHg _48R5sLw9Eeaj7tVusjQpHg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_sCN3ALw9Eeaj7tVusjQpHg" name="Annotation" tooltipText="" incomingEdges="_yzbFELw9Eeaj7tVusjQpHg _0y2mMLw9Eeaj7tVusjQpHg _12OHsLw9Eeaj7tVusjQpHg _3uiUMLw9Eeaj7tVusjQpHg _48R5sLw9Eeaj7tVusjQpHg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicproblem.ecore#//Annotation"/>
       <semanticElements xmi:type="ecore:EClass" href="logicproblem.ecore#//Annotation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_sCOeELw9Eeaj7tVusjQpHg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_sCOeELw9Eeaj7tVusjQpHg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yzbFELw9Eeaj7tVusjQpHg" name="[0..*] annotations" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_sCN3ALw9Eeaj7tVusjQpHg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yzbFELw9Eeaj7tVusjQpHg" name="[0..*] annotations" sourceNode="_w2mZcGCGEeWg-_mfCA72gg" targetNode="_sCN3ALw9Eeaj7tVusjQpHg">
       <target xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/annotations"/>
       <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//LogicProblem/annotations"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_yzbsILw9Eeaj7tVusjQpHg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_yzbsIbw9Eeaj7tVusjQpHg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yzbsILw9Eeaj7tVusjQpHg" description="_w24tUGCGEeWg-_mfCA72gg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_yzbsIbw9Eeaj7tVusjQpHg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_yzbsIrw9Eeaj7tVusjQpHg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_yzbsIrw9Eeaj7tVusjQpHg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_0y2mMLw9Eeaj7tVusjQpHg" sourceNode="_ywfiULw8Eeaj7tVusjQpHg" targetNode="_sCN3ALw9Eeaj7tVusjQpHg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_0y2mMLw9Eeaj7tVusjQpHg" sourceNode="_ywfiULw8Eeaj7tVusjQpHg" targetNode="_sCN3ALw9Eeaj7tVusjQpHg">
       <target xmi:type="ecore:EClass" href="logicproblem.ecore#//AssertionAnnotation"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicproblem.ecore#//AssertionAnnotation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_0y3NQLw9Eeaj7tVusjQpHg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicproblem.ecore#//AssertionAnnotation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_0y3NQLw9Eeaj7tVusjQpHg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_0y3NQbw9Eeaj7tVusjQpHg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_0y3NQbw9Eeaj7tVusjQpHg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_0y3NQrw9Eeaj7tVusjQpHg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_0y3NQrw9Eeaj7tVusjQpHg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_12OHsLw9Eeaj7tVusjQpHg" sourceNode="_t4w-YLw8Eeaj7tVusjQpHg" targetNode="_sCN3ALw9Eeaj7tVusjQpHg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_12OHsLw9Eeaj7tVusjQpHg" sourceNode="_t4w-YLw8Eeaj7tVusjQpHg" targetNode="_sCN3ALw9Eeaj7tVusjQpHg">
       <target xmi:type="ecore:EClass" href="logicproblem.ecore#//FunctionAnnotation"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicproblem.ecore#//FunctionAnnotation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_XtjlcMDnEea_b6UyFzv22g" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicproblem.ecore#//FunctionAnnotation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_XtjlcMDnEea_b6UyFzv22g" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_XtjlccDnEea_b6UyFzv22g" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_XtjlccDnEea_b6UyFzv22g" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_XtjlcsDnEea_b6UyFzv22g" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_XtjlcsDnEea_b6UyFzv22g" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_3uiUMLw9Eeaj7tVusjQpHg" sourceNode="_hJDKgLw8Eeaj7tVusjQpHg" targetNode="_sCN3ALw9Eeaj7tVusjQpHg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_3uiUMLw9Eeaj7tVusjQpHg" sourceNode="_hJDKgLw8Eeaj7tVusjQpHg" targetNode="_sCN3ALw9Eeaj7tVusjQpHg">
       <target xmi:type="ecore:EClass" href="logicproblem.ecore#//RelationAnnotation"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicproblem.ecore#//RelationAnnotation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Xti-YMDnEea_b6UyFzv22g" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicproblem.ecore#//RelationAnnotation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Xti-YMDnEea_b6UyFzv22g" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Xti-YcDnEea_b6UyFzv22g" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Xti-YcDnEea_b6UyFzv22g" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Xti-YsDnEea_b6UyFzv22g" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Xti-YsDnEea_b6UyFzv22g" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_48R5sLw9Eeaj7tVusjQpHg" sourceNode="_p3bP4Lw8Eeaj7tVusjQpHg" targetNode="_sCN3ALw9Eeaj7tVusjQpHg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_48R5sLw9Eeaj7tVusjQpHg" sourceNode="_p3bP4Lw8Eeaj7tVusjQpHg" targetNode="_sCN3ALw9Eeaj7tVusjQpHg">
       <target xmi:type="ecore:EClass" href="logicproblem.ecore#//ConstantAnnotation"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicproblem.ecore#//ConstantAnnotation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Xti-Y8DnEea_b6UyFzv22g" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicproblem.ecore#//ConstantAnnotation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Xti-Y8DnEea_b6UyFzv22g" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Xti-ZMDnEea_b6UyFzv22g" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Xti-ZMDnEea_b6UyFzv22g" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Xti-ZcDnEea_b6UyFzv22g" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Xti-ZcDnEea_b6UyFzv22g" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_iboOgMDjEea_b6UyFzv22g" sourceNode="_p3bP4Lw8Eeaj7tVusjQpHg" targetNode="_3P1zcGCGEeWg-_mfCA72gg" beginLabel="[0..*] annotations" endLabel="[1..1] target">
-      <target xmi:type="ecore:EReference" href="logicproblem.ecore#//ConstantAnnotation/target"/>
-      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/annotations"/>
-      <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//ConstantAnnotation/target"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Xtkzk8DnEea_b6UyFzv22g" description="_XtkzkMDnEea_b6UyFzv22g" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_XtkzlMDnEea_b6UyFzv22g" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </beginLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_XtkzlcDnEea_b6UyFzv22g" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </endLabelStyle>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_03MnBm6hEemSyfDlsGAqLA" sourceNode="_3P4PsGCGEeWg-_mfCA72gg" targetNode="_hJDKgLw8Eeaj7tVusjQpHg" beginLabel="[1..1] target" endLabel="[0..*] annotations">
+      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/annotations"/>
+      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/annotations"/>
+      <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//RelationAnnotation/target"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_03NOEG6hEemSyfDlsGAqLA" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_03NOEW6hEemSyfDlsGAqLA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_03NOEm6hEemSyfDlsGAqLA" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_jjvtIMDjEea_b6UyFzv22g" sourceNode="_hJDKgLw8Eeaj7tVusjQpHg" targetNode="_3P4PsGCGEeWg-_mfCA72gg" beginLabel="[0..*] annotations" endLabel="[1..1] target">
-      <target xmi:type="ecore:EReference" href="logicproblem.ecore#//RelationAnnotation/target"/>
-      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/annotations"/>
-      <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//RelationAnnotation/target"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_XtlaoMDnEea_b6UyFzv22g" description="_XtkzkMDnEea_b6UyFzv22g" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_XtlaocDnEea_b6UyFzv22g" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </beginLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_XtlaosDnEea_b6UyFzv22g" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </endLabelStyle>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_03N1IG6hEemSyfDlsGAqLA" sourceNode="_3P1zcGCGEeWg-_mfCA72gg" targetNode="_p3bP4Lw8Eeaj7tVusjQpHg" beginLabel="[1..1] target" endLabel="[0..*] annotations">
+      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/annotations"/>
+      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/annotations"/>
+      <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//ConstantAnnotation/target"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_03N1IW6hEemSyfDlsGAqLA" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_03N1Im6hEemSyfDlsGAqLA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_03N1I26hEemSyfDlsGAqLA" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_kiXRgMDjEea_b6UyFzv22g" sourceNode="_t4w-YLw8Eeaj7tVusjQpHg" targetNode="_3P3BkGCGEeWg-_mfCA72gg" beginLabel="[0..*] annotations" endLabel="[1..1] target">
-      <target xmi:type="ecore:EReference" href="logicproblem.ecore#//FunctionAnnotation/target"/>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_03OcMG6hEemSyfDlsGAqLA" sourceNode="_3P3BkGCGEeWg-_mfCA72gg" targetNode="_t4w-YLw8Eeaj7tVusjQpHg" beginLabel="[1..1] target" endLabel="[0..*] annotations">
+      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/annotations"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/annotations"/>
       <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//FunctionAnnotation/target"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_XtmBsMDnEea_b6UyFzv22g" description="_XtkzkMDnEea_b6UyFzv22g" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_XtmBscDnEea_b6UyFzv22g" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </beginLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_XtmBssDnEea_b6UyFzv22g" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </endLabelStyle>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_03OcMW6hEemSyfDlsGAqLA" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_03OcMm6hEemSyfDlsGAqLA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_03OcM26hEemSyfDlsGAqLA" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_XtnP0MDnEea_b6UyFzv22g" sourceNode="_ywfiULw8Eeaj7tVusjQpHg" targetNode="_3Pz-QGCGEeWg-_mfCA72gg" beginLabel="[0..*] annotations" endLabel="[1..1] target">
-      <target xmi:type="ecore:EReference" href="logicproblem.ecore#//AssertionAnnotation/target"/>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_03PDQG6hEemSyfDlsGAqLA" sourceNode="_3Pz-QGCGEeWg-_mfCA72gg" targetNode="_ywfiULw8Eeaj7tVusjQpHg" beginLabel="[1..1] target" endLabel="[0..*] annotations">
+      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Assertion/annotations"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Assertion/annotations"/>
       <semanticElements xmi:type="ecore:EReference" href="logicproblem.ecore#//AssertionAnnotation/target"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_XtnP0cDnEea_b6UyFzv22g" description="_XtkzkMDnEea_b6UyFzv22g" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_XtnP0sDnEea_b6UyFzv22g" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </beginLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_XtnP08DnEea_b6UyFzv22g" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </endLabelStyle>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_03PDQW6hEemSyfDlsGAqLA" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_03PDQm6hEemSyfDlsGAqLA" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_03PDQ26hEemSyfDlsGAqLA" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_veq9NWCGEeWg-_mfCA72gg"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_veq9NWCGEeWg-_mfCA72gg"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
     <target xmi:type="ecore:EPackage" href="logicproblem.ecore#/"/>
   </diagram:DSemanticDiagram>
-  <diagram:DSemanticDiagram xmi:id="_v6LzUIApEeW6pe97ikalXw" name="Types and Type References" uid="_TDHEYG7rEeifqZoaQeIEkw">
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_v6LzUYApEeW6pe97ikalXw" source="DANNOTATION_CUSTOMIZATION_KEY">
-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_v6LzUoApEeW6pe97ikalXw">
+  <diagram:DSemanticDiagram uid="_v6LzUIApEeW6pe97ikalXw" name="Types and Type References">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_v6LzUYApEeW6pe97ikalXw" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_v6LzUoApEeW6pe97ikalXw">
         <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_yNw_gIApEeW6pe97ikalXw" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
           <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelFormat>bold</labelFormat>
@@ -4706,7 +4773,7 @@
         </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_v6ac0IApEeW6pe97ikalXw" source="GMF_DIAGRAMS">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_v6ac0IApEeW6pe97ikalXw" source="GMF_DIAGRAMS">
       <data xmi:type="notation:Diagram" xmi:id="_v6ac0YApEeW6pe97ikalXw" type="Sirius" element="_v6LzUIApEeW6pe97ikalXw" measurementUnit="Pixel">
         <children xmi:type="notation:Node" xmi:id="_yPoAsIApEeW6pe97ikalXw" type="2003" element="_yLnqcIApEeW6pe97ikalXw">
           <children xmi:type="notation:Node" xmi:id="_yPpO0IApEeW6pe97ikalXw" type="5007"/>
@@ -5051,339 +5118,339 @@
         </edges>
       </data>
     </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yLnqcIApEeW6pe97ikalXw" name="Type" tooltipText="" outgoingEdges="_yOweAIApEeW6pe97ikalXw _OLUM0IPKEeWOre-0TMCmMQ" incomingEdges="_yOHk04ApEeW6pe97ikalXw _yOxsI4ApEeW6pe97ikalXw _yPalU4ApEeW6pe97ikalXw _OLUM0IPKEeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yLnqcIApEeW6pe97ikalXw" name="Type" tooltipText="" outgoingEdges="_yOweAIApEeW6pe97ikalXw _OLUM0IPKEeWOre-0TMCmMQ" incomingEdges="_yOHk04ApEeW6pe97ikalXw _yOxsI4ApEeW6pe97ikalXw _yPalU4ApEeW6pe97ikalXw _OLUM0IPKEeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Type"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Type"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_uOJOEImGEeWccOHwfpGNpw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_uOJOEImGEeWccOHwfpGNpw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_yNwYcIApEeW6pe97ikalXw" name="name : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_yNwYcIApEeW6pe97ikalXw" name="name : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/name"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_yNxmkIApEeW6pe97ikalXw" labelAlignment="LEFT" description="_yNw_gIApEeW6pe97ikalXw">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_yNxmkIApEeW6pe97ikalXw" labelAlignment="LEFT" description="_yNw_gIApEeW6pe97ikalXw">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_XOL5cImGEeWccOHwfpGNpw" name="isAbstract : EBoolean = false" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_XOL5cImGEeWccOHwfpGNpw" name="isAbstract : EBoolean = false" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/isAbstract"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//Type/isAbstract"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_uOOGkImGEeWccOHwfpGNpw" labelAlignment="LEFT" description="_yNw_gIApEeW6pe97ikalXw">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_uOOGkImGEeWccOHwfpGNpw" labelAlignment="LEFT" description="_yNw_gIApEeW6pe97ikalXw">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yLrU0IApEeW6pe97ikalXw" name="DefinedElement" tooltipText="" outgoingEdges="_ydGHUHt9EeeCn_RNMwgEBg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yLrU0IApEeW6pe97ikalXw" name="DefinedElement" tooltipText="" outgoingEdges="_ydGHUHt9EeeCn_RNMwgEBg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_yLr74IApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_yLr74IApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yLsi8IApEeW6pe97ikalXw" name="TypeDefinition" tooltipText="" outgoingEdges="_yOG9wIApEeW6pe97ikalXw _yOxsI4ApEeW6pe97ikalXw" incomingEdges="_ydGHUHt9EeeCn_RNMwgEBg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yLsi8IApEeW6pe97ikalXw" name="TypeDefinition" tooltipText="" outgoingEdges="_yOG9wIApEeW6pe97ikalXw _yOxsI4ApEeW6pe97ikalXw" incomingEdges="_ydGHUHt9EeeCn_RNMwgEBg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDefinition"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDefinition"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_yLtKAIApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_yLtKAIApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yLtxEIApEeW6pe97ikalXw" name="TypeReference" tooltipText="" outgoingEdges="_yOy6QIApEeW6pe97ikalXw" incomingEdges="_yOzhU4ApEeW6pe97ikalXw _yO0IY4ApEeW6pe97ikalXw" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yLtxEIApEeW6pe97ikalXw" name="TypeReference" tooltipText="" outgoingEdges="_yOy6QIApEeW6pe97ikalXw" incomingEdges="_yOzhU4ApEeW6pe97ikalXw _yO0IY4ApEeW6pe97ikalXw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_yLuYIIApEeW6pe97ikalXw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_yLuYIIApEeW6pe97ikalXw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yLu_MIApEeW6pe97ikalXw" name="ComplexTypeReference" tooltipText="" outgoingEdges="_yOHk04ApEeW6pe97ikalXw _yOzhU4ApEeW6pe97ikalXw" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yLu_MIApEeW6pe97ikalXw" name="ComplexTypeReference" tooltipText="" outgoingEdges="_yOHk04ApEeW6pe97ikalXw _yOzhU4ApEeW6pe97ikalXw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ComplexTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ComplexTypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_yLu_MYApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_yLu_MYApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yLw0YIApEeW6pe97ikalXw" name="PrimitiveTypeReference" tooltipText="" outgoingEdges="_yO0IY4ApEeW6pe97ikalXw" incomingEdges="_yO0vc4ApEeW6pe97ikalXw _yO19kIApEeW6pe97ikalXw _yO2ko4ApEeW6pe97ikalXw _8SF2gHt9EeeCn_RNMwgEBg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yLw0YIApEeW6pe97ikalXw" name="PrimitiveTypeReference" tooltipText="" outgoingEdges="_yO0IY4ApEeW6pe97ikalXw" incomingEdges="_yO0vc4ApEeW6pe97ikalXw _yO19kIApEeW6pe97ikalXw _yO2ko4ApEeW6pe97ikalXw _8SF2gHt9EeeCn_RNMwgEBg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveTypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_yL7zgIApEeW6pe97ikalXw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_yL7zgIApEeW6pe97ikalXw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yL_d4IApEeW6pe97ikalXw" name="IntTypeReference" tooltipText="" outgoingEdges="_yO0vc4ApEeW6pe97ikalXw" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yL_d4IApEeW6pe97ikalXw" name="IntTypeReference" tooltipText="" outgoingEdges="_yO0vc4ApEeW6pe97ikalXw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntTypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_yL_d4YApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_yL_d4YApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yMBTEIApEeW6pe97ikalXw" name="BoolTypeReference" tooltipText="" outgoingEdges="_yO19kIApEeW6pe97ikalXw" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yMBTEIApEeW6pe97ikalXw" name="BoolTypeReference" tooltipText="" outgoingEdges="_yO19kIApEeW6pe97ikalXw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolTypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_yMBTEYApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_yMBTEYApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yMChMIApEeW6pe97ikalXw" name="RealTypeReference" tooltipText="" outgoingEdges="_yO2ko4ApEeW6pe97ikalXw" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yMChMIApEeW6pe97ikalXw" name="RealTypeReference" tooltipText="" outgoingEdges="_yO2ko4ApEeW6pe97ikalXw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealTypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_yMDIQIApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_yMDIQIApEeW6pe97ikalXw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yMqMQIApEeW6pe97ikalXw" name="TypeDescriptor" tooltipText="" incomingEdges="_yOweAIApEeW6pe97ikalXw _yOy6QIApEeW6pe97ikalXw" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yMqMQIApEeW6pe97ikalXw" name="TypeDescriptor" tooltipText="" incomingEdges="_yOweAIApEeW6pe97ikalXw _yOy6QIApEeW6pe97ikalXw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDescriptor"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDescriptor"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_yMqzUIApEeW6pe97ikalXw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_yMqzUIApEeW6pe97ikalXw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_yM4OsIApEeW6pe97ikalXw" name="TypeDeclaration" tooltipText="" outgoingEdges="_yPalU4ApEeW6pe97ikalXw" incomingEdges="_yOG9wIApEeW6pe97ikalXw" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_yM4OsIApEeW6pe97ikalXw" name="TypeDeclaration" tooltipText="" outgoingEdges="_yPalU4ApEeW6pe97ikalXw" incomingEdges="_yOG9wIApEeW6pe97ikalXw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_W210sG7rEeifqZoaQeIEkw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_W210sG7rEeifqZoaQeIEkw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yOG9wIApEeW6pe97ikalXw" name="[0..1] defines" sourceNode="_yLsi8IApEeW6pe97ikalXw" targetNode="_yM4OsIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yOG9wIApEeW6pe97ikalXw" name="[0..1] defines" sourceNode="_yLsi8IApEeW6pe97ikalXw" targetNode="_yM4OsIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//TypeDefinition/defines"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//TypeDefinition/defines"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_yOHk0IApEeW6pe97ikalXw" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yOHk0IApEeW6pe97ikalXw" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_yOHk0YApEeW6pe97ikalXw" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_yOHk0YApEeW6pe97ikalXw" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_yOHk0oApEeW6pe97ikalXw" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_yOHk0oApEeW6pe97ikalXw" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yOHk04ApEeW6pe97ikalXw" name="[0..1] referred" sourceNode="_yLu_MIApEeW6pe97ikalXw" targetNode="_yLnqcIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yOHk04ApEeW6pe97ikalXw" name="[0..1] referred" sourceNode="_yLu_MIApEeW6pe97ikalXw" targetNode="_yLnqcIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//ComplexTypeReference/referred"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//ComplexTypeReference/referred"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_yOIL4IApEeW6pe97ikalXw" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yOIL4IApEeW6pe97ikalXw" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_yOIL4YApEeW6pe97ikalXw" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_yOIL4YApEeW6pe97ikalXw" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_yOIL4oApEeW6pe97ikalXw" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_yOIL4oApEeW6pe97ikalXw" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yOweAIApEeW6pe97ikalXw" sourceNode="_yLnqcIApEeW6pe97ikalXw" targetNode="_yMqMQIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yOweAIApEeW6pe97ikalXw" sourceNode="_yLnqcIApEeW6pe97ikalXw" targetNode="_yMqMQIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Type"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Type"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_uOS_EImGEeWccOHwfpGNpw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_uOS_EImGEeWccOHwfpGNpw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_uOS_EYmGEeWccOHwfpGNpw" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_uOS_EYmGEeWccOHwfpGNpw" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_uOS_EomGEeWccOHwfpGNpw" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_uOS_EomGEeWccOHwfpGNpw" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yOxsI4ApEeW6pe97ikalXw" sourceNode="_yLsi8IApEeW6pe97ikalXw" targetNode="_yLnqcIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yOxsI4ApEeW6pe97ikalXw" sourceNode="_yLsi8IApEeW6pe97ikalXw" targetNode="_yLnqcIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDefinition"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDefinition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_yOyTMIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yOyTMIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_yOyTMYApEeW6pe97ikalXw" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_yOyTMYApEeW6pe97ikalXw" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_yOyTMoApEeW6pe97ikalXw" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_yOyTMoApEeW6pe97ikalXw" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yOy6QIApEeW6pe97ikalXw" sourceNode="_yLtxEIApEeW6pe97ikalXw" targetNode="_yMqMQIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yOy6QIApEeW6pe97ikalXw" sourceNode="_yLtxEIApEeW6pe97ikalXw" targetNode="_yMqMQIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_yOzhUIApEeW6pe97ikalXw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yOzhUIApEeW6pe97ikalXw" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_yOzhUYApEeW6pe97ikalXw" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_yOzhUYApEeW6pe97ikalXw" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_yOzhUoApEeW6pe97ikalXw" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_yOzhUoApEeW6pe97ikalXw" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yOzhU4ApEeW6pe97ikalXw" sourceNode="_yLu_MIApEeW6pe97ikalXw" targetNode="_yLtxEIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yOzhU4ApEeW6pe97ikalXw" sourceNode="_yLu_MIApEeW6pe97ikalXw" targetNode="_yLtxEIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ComplexTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ComplexTypeReference"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_yO0IYIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yO0IYIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_yO0IYYApEeW6pe97ikalXw" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_yO0IYYApEeW6pe97ikalXw" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_yO0IYoApEeW6pe97ikalXw" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_yO0IYoApEeW6pe97ikalXw" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yO0IY4ApEeW6pe97ikalXw" sourceNode="_yLw0YIApEeW6pe97ikalXw" targetNode="_yLtxEIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yO0IY4ApEeW6pe97ikalXw" sourceNode="_yLw0YIApEeW6pe97ikalXw" targetNode="_yLtxEIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveTypeReference"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_yO0vcIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yO0vcIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_yO0vcYApEeW6pe97ikalXw" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_yO0vcYApEeW6pe97ikalXw" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_yO0vcoApEeW6pe97ikalXw" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_yO0vcoApEeW6pe97ikalXw" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yO0vc4ApEeW6pe97ikalXw" sourceNode="_yL_d4IApEeW6pe97ikalXw" targetNode="_yLw0YIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yO0vc4ApEeW6pe97ikalXw" sourceNode="_yL_d4IApEeW6pe97ikalXw" targetNode="_yLw0YIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntTypeReference"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_yO1WgIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yO1WgIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_yO1WgYApEeW6pe97ikalXw" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_yO1WgYApEeW6pe97ikalXw" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_yO1WgoApEeW6pe97ikalXw" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_yO1WgoApEeW6pe97ikalXw" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yO19kIApEeW6pe97ikalXw" sourceNode="_yMBTEIApEeW6pe97ikalXw" targetNode="_yLw0YIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yO19kIApEeW6pe97ikalXw" sourceNode="_yMBTEIApEeW6pe97ikalXw" targetNode="_yLw0YIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolTypeReference"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_yO2koIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yO2koIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_yO2koYApEeW6pe97ikalXw" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_yO2koYApEeW6pe97ikalXw" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_yO2kooApEeW6pe97ikalXw" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_yO2kooApEeW6pe97ikalXw" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yO2ko4ApEeW6pe97ikalXw" sourceNode="_yMChMIApEeW6pe97ikalXw" targetNode="_yLw0YIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yO2ko4ApEeW6pe97ikalXw" sourceNode="_yMChMIApEeW6pe97ikalXw" targetNode="_yLw0YIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealTypeReference"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_yO3LsIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_yO3LsIApEeW6pe97ikalXw" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_yO3LsYApEeW6pe97ikalXw" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_yO3LsYApEeW6pe97ikalXw" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_yO3LsoApEeW6pe97ikalXw" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_yO3LsoApEeW6pe97ikalXw" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_yPalU4ApEeW6pe97ikalXw" sourceNode="_yM4OsIApEeW6pe97ikalXw" targetNode="_yLnqcIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_yPalU4ApEeW6pe97ikalXw" sourceNode="_yM4OsIApEeW6pe97ikalXw" targetNode="_yLnqcIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeDeclaration"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_W3FsUG7rEeifqZoaQeIEkw" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_W3FsUG7rEeifqZoaQeIEkw" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_W3FsUW7rEeifqZoaQeIEkw" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_W3FsUW7rEeifqZoaQeIEkw" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_W3FsUm7rEeifqZoaQeIEkw" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_W3FsUm7rEeifqZoaQeIEkw" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_OLUM0IPKEeWOre-0TMCmMQ" sourceNode="_yLnqcIApEeW6pe97ikalXw" targetNode="_yLnqcIApEeW6pe97ikalXw" beginLabel="[0..*] supertypes" endLabel="[0..*] subtypes">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OLUM0IPKEeWOre-0TMCmMQ" sourceNode="_yLnqcIApEeW6pe97ikalXw" targetNode="_yLnqcIApEeW6pe97ikalXw" beginLabel="[0..*] supertypes" endLabel="[0..*] subtypes">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Type/subtypes"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Type/subtypes"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Type/supertypes"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_OLUz4IPKEeWOre-0TMCmMQ" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OLUz4IPKEeWOre-0TMCmMQ" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_OLUz4YPKEeWOre-0TMCmMQ" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_OLUz4oPKEeWOre-0TMCmMQ" showIcon="false"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OLUz4YPKEeWOre-0TMCmMQ" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_OLUz4oPKEeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_ydGHUHt9EeeCn_RNMwgEBg" sourceNode="_yLrU0IApEeW6pe97ikalXw" targetNode="_yLsi8IApEeW6pe97ikalXw" beginLabel="[0..*] elements" endLabel="[0..*] definedInType">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ydGHUHt9EeeCn_RNMwgEBg" sourceNode="_yLrU0IApEeW6pe97ikalXw" targetNode="_yLsi8IApEeW6pe97ikalXw" beginLabel="[0..*] elements" endLabel="[0..*] definedInType">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//DefinedElement/definedInType"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//DefinedElement/definedInType"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//TypeDefinition/elements"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Uzv7kG7rEeifqZoaQeIEkw" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Uzv7kG7rEeifqZoaQeIEkw" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Uzv7kW7rEeifqZoaQeIEkw" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_Uzv7km7rEeifqZoaQeIEkw" showIcon="false"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Uzv7kW7rEeifqZoaQeIEkw" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_Uzv7km7rEeifqZoaQeIEkw" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_1t3UgHt9EeeCn_RNMwgEBg" name="StringTypeReference" tooltipText="" outgoingEdges="_8SF2gHt9EeeCn_RNMwgEBg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_1t3UgHt9EeeCn_RNMwgEBg" name="StringTypeReference" tooltipText="" outgoingEdges="_8SF2gHt9EeeCn_RNMwgEBg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringTypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_1t37kHt9EeeCn_RNMwgEBg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_1t37kHt9EeeCn_RNMwgEBg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_8SF2gHt9EeeCn_RNMwgEBg" sourceNode="_1t3UgHt9EeeCn_RNMwgEBg" targetNode="_yLw0YIApEeW6pe97ikalXw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_8SF2gHt9EeeCn_RNMwgEBg" sourceNode="_1t3UgHt9EeeCn_RNMwgEBg" targetNode="_yLw0YIApEeW6pe97ikalXw">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringTypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringTypeReference"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_8SGdkHt9EeeCn_RNMwgEBg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_8SGdkHt9EeeCn_RNMwgEBg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_8SGdkXt9EeeCn_RNMwgEBg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_8SGdkXt9EeeCn_RNMwgEBg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_8SGdknt9EeeCn_RNMwgEBg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_8SGdknt9EeeCn_RNMwgEBg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_v6LzVYApEeW6pe97ikalXw"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_v6LzVYApEeW6pe97ikalXw"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
     <target xmi:type="ecore:EPackage" href="logiclanguage.ecore#/"/>
   </diagram:DSemanticDiagram>
-  <diagram:DSemanticDiagram xmi:id="_FSREgIP2EeWOre-0TMCmMQ" name="Constants, Functions and Relations" uid="_TDSDgG7rEeifqZoaQeIEkw">
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_FSREgYP2EeWOre-0TMCmMQ" source="DANNOTATION_CUSTOMIZATION_KEY">
-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_FSREgoP2EeWOre-0TMCmMQ">
+  <diagram:DSemanticDiagram uid="_FSREgIP2EeWOre-0TMCmMQ" name="Constants, Functions and Relations">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_FSREgYP2EeWOre-0TMCmMQ" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_FSREgoP2EeWOre-0TMCmMQ">
         <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_FSREg4P2EeWOre-0TMCmMQ" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
           <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelFormat>bold</labelFormat>
@@ -5411,11 +5478,15 @@
         </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_FSREioP2EeWOre-0TMCmMQ" source="GMF_DIAGRAMS">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_FSREioP2EeWOre-0TMCmMQ" source="GMF_DIAGRAMS">
       <data xmi:type="notation:Diagram" xmi:id="_FSREi4P2EeWOre-0TMCmMQ" type="Sirius" element="_FSREgIP2EeWOre-0TMCmMQ" measurementUnit="Pixel">
         <children xmi:type="notation:Node" xmi:id="_FSREloP2EeWOre-0TMCmMQ" type="2003" element="_FSRvsIP2EeWOre-0TMCmMQ">
           <children xmi:type="notation:Node" xmi:id="_FSREl4P2EeWOre-0TMCmMQ" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_FSREmIP2EeWOre-0TMCmMQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_zbdBwG6hEemSyfDlsGAqLA" type="3010" element="_zbPmYG6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_zbdBwW6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_zbdBwm6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_FSREmYP2EeWOre-0TMCmMQ"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_FSREmoP2EeWOre-0TMCmMQ"/>
           </children>
@@ -5434,6 +5505,10 @@
         <children xmi:type="notation:Node" xmi:id="_FSREzoP2EeWOre-0TMCmMQ" type="2003" element="_FSRvwIP2EeWOre-0TMCmMQ">
           <children xmi:type="notation:Node" xmi:id="_FSREz4P2EeWOre-0TMCmMQ" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_FSRE0IP2EeWOre-0TMCmMQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_zbdo0G6hEemSyfDlsGAqLA" type="3010" element="_zbQNcG6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_zbdo0W6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_zbdo0m6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_FSRE0YP2EeWOre-0TMCmMQ"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_FSRE0oP2EeWOre-0TMCmMQ"/>
           </children>
@@ -5474,6 +5549,10 @@
         <children xmi:type="notation:Node" xmi:id="_FSRFy4P2EeWOre-0TMCmMQ" type="2003" element="_FSRwDoP2EeWOre-0TMCmMQ">
           <children xmi:type="notation:Node" xmi:id="_FSRFzIP2EeWOre-0TMCmMQ" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_FSRFzYP2EeWOre-0TMCmMQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_zbdo026hEemSyfDlsGAqLA" type="3010" element="_zbRbkG6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_zbdo1G6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_zbdo1W6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_FSRFzoP2EeWOre-0TMCmMQ"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_FSRFz4P2EeWOre-0TMCmMQ"/>
           </children>
@@ -5483,6 +5562,10 @@
         <children xmi:type="notation:Node" xmi:id="_FSRF0oP2EeWOre-0TMCmMQ" type="2003" element="_FSRwEIP2EeWOre-0TMCmMQ">
           <children xmi:type="notation:Node" xmi:id="_FSRF04P2EeWOre-0TMCmMQ" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_FSRF1IP2EeWOre-0TMCmMQ" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_zbeP4G6hEemSyfDlsGAqLA" type="3010" element="_zbSCoG6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_zbeP4W6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_zbeP4m6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_FSRF1YP2EeWOre-0TMCmMQ"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_FSRF1oP2EeWOre-0TMCmMQ"/>
           </children>
@@ -6024,531 +6107,563 @@
         </edges>
       </data>
     </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSRvsIP2EeWOre-0TMCmMQ" name="DefinedElement" tooltipText="" outgoingEdges="_FSSSq4P2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSRvsIP2EeWOre-0TMCmMQ" name="DefinedElement" tooltipText="" outgoingEdges="_FSSSq4P2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSRvsYP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSRvsYP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_zbPmYG6hEemSyfDlsGAqLA" name=" definedInType : TypeDefinition" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//DefinedElement/definedInType"/>
+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//DefinedElement/definedInType"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_zbPmYW6hEemSyfDlsGAqLA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSRvtIP2EeWOre-0TMCmMQ" name="TypeReference" tooltipText="" incomingEdges="_FSRwGoP2EeWOre-0TMCmMQ _FSRwHoP2EeWOre-0TMCmMQ _FSRwKoP2EeWOre-0TMCmMQ _FSRwioP2EeWOre-0TMCmMQ _FSSSo4P2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSRvtIP2EeWOre-0TMCmMQ" name="TypeReference" tooltipText="" incomingEdges="_FSRwGoP2EeWOre-0TMCmMQ _FSRwHoP2EeWOre-0TMCmMQ _FSRwKoP2EeWOre-0TMCmMQ _FSRwioP2EeWOre-0TMCmMQ _FSSSo4P2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSRvtYP2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSRvtYP2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSRvwIP2EeWOre-0TMCmMQ" name="Function" tooltipText="" outgoingEdges="_FSRwGoP2EeWOre-0TMCmMQ _FSRwHoP2EeWOre-0TMCmMQ _FSSSy4P2EeWOre-0TMCmMQ" incomingEdges="_FSSTZYP2EeWOre-0TMCmMQ _FSSTlYP2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSRvwIP2EeWOre-0TMCmMQ" name="Function" tooltipText="" outgoingEdges="_FSRwGoP2EeWOre-0TMCmMQ _FSRwHoP2EeWOre-0TMCmMQ _FSSSy4P2EeWOre-0TMCmMQ" incomingEdges="_FSSTZYP2EeWOre-0TMCmMQ _FSSTlYP2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Function"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Function"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSRvwYP2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSRvwYP2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_zbQNcG6hEemSyfDlsGAqLA" name=" annotations : FunctionAnnotation" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/annotations"/>
+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/annotations"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_zbQNcW6hEemSyfDlsGAqLA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSRvwoP2EeWOre-0TMCmMQ" name="Term" tooltipText="" incomingEdges="_FSSTVYP2EeWOre-0TMCmMQ _FSSTX4P2EeWOre-0TMCmMQ _FSSTbYP2EeWOre-0TMCmMQ _FSSTc4P2EeWOre-0TMCmMQ _FSSTd4P2EeWOre-0TMCmMQ _FSSTe4P2EeWOre-0TMCmMQ _FSSTf4P2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSRvwoP2EeWOre-0TMCmMQ" name="Term" tooltipText="" incomingEdges="_FSSTVYP2EeWOre-0TMCmMQ _FSSTX4P2EeWOre-0TMCmMQ _FSSTbYP2EeWOre-0TMCmMQ _FSSTc4P2EeWOre-0TMCmMQ _FSSTd4P2EeWOre-0TMCmMQ _FSSTe4P2EeWOre-0TMCmMQ _FSSTf4P2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSRvw4P2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSRvw4P2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSRvxIP2EeWOre-0TMCmMQ" name="SymbolicDeclaration" tooltipText="" incomingEdges="_FSSSq4P2EeWOre-0TMCmMQ _FSSSy4P2EeWOre-0TMCmMQ _FSSS64P2EeWOre-0TMCmMQ _FSSTR4P2EeWOre-0TMCmMQ _FSSTS4P2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSRvxIP2EeWOre-0TMCmMQ" name="SymbolicDeclaration" tooltipText="" incomingEdges="_FSSSq4P2EeWOre-0TMCmMQ _FSSSy4P2EeWOre-0TMCmMQ _FSSS64P2EeWOre-0TMCmMQ _FSSTR4P2EeWOre-0TMCmMQ _FSSTS4P2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSRvxYP2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSRvxYP2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_FSRvxoP2EeWOre-0TMCmMQ" name="name : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_FSRvxoP2EeWOre-0TMCmMQ" name="name : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//SymbolicDeclaration/name"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//SymbolicDeclaration/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_FSRvx4P2EeWOre-0TMCmMQ" labelAlignment="LEFT" description="_FSREg4P2EeWOre-0TMCmMQ">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_FSRvx4P2EeWOre-0TMCmMQ" labelAlignment="LEFT" description="_FSREg4P2EeWOre-0TMCmMQ">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSRv2IP2EeWOre-0TMCmMQ" name="Variable" tooltipText="" outgoingEdges="_FSRwKoP2EeWOre-0TMCmMQ _FSSS64P2EeWOre-0TMCmMQ" incomingEdges="_FSSTW4P2EeWOre-0TMCmMQ _FSSTaYP2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSRv2IP2EeWOre-0TMCmMQ" name="Variable" tooltipText="" outgoingEdges="_FSRwKoP2EeWOre-0TMCmMQ _FSSS64P2EeWOre-0TMCmMQ" incomingEdges="_FSSTW4P2EeWOre-0TMCmMQ _FSSTaYP2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSRv2YP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSRv2YP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSRwDoP2EeWOre-0TMCmMQ" name="Relation" tooltipText="" outgoingEdges="_FSRwioP2EeWOre-0TMCmMQ _FSSTR4P2EeWOre-0TMCmMQ" incomingEdges="_FSSTj4P2EeWOre-0TMCmMQ _FSSTmYP2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSRwDoP2EeWOre-0TMCmMQ" name="Relation" tooltipText="" outgoingEdges="_FSRwioP2EeWOre-0TMCmMQ _FSSTR4P2EeWOre-0TMCmMQ" incomingEdges="_FSSTj4P2EeWOre-0TMCmMQ _FSSTmYP2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSRwD4P2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSRwD4P2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_zbRbkG6hEemSyfDlsGAqLA" name=" annotations : RelationAnnotation" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/annotations"/>
+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/annotations"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_zbRbkW6hEemSyfDlsGAqLA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSRwEIP2EeWOre-0TMCmMQ" name="Constant" tooltipText="" outgoingEdges="_FSSSo4P2EeWOre-0TMCmMQ _FSSTS4P2EeWOre-0TMCmMQ" incomingEdges="_FSSTUYP2EeWOre-0TMCmMQ _FSSThYP2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSRwEIP2EeWOre-0TMCmMQ" name="Constant" tooltipText="" outgoingEdges="_FSSSo4P2EeWOre-0TMCmMQ _FSSTS4P2EeWOre-0TMCmMQ" incomingEdges="_FSSTUYP2EeWOre-0TMCmMQ _FSSThYP2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Constant"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Constant"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSRwEYP2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSRwEYP2EeWOre-0TMCmMQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_zbSCoG6hEemSyfDlsGAqLA" name=" annotations : ConstantAnnotation" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/annotations"/>
+        <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/annotations"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_zbSCoW6hEemSyfDlsGAqLA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSRwGoP2EeWOre-0TMCmMQ" name="[1..1] range" sourceNode="_FSRvwIP2EeWOre-0TMCmMQ" targetNode="_FSRvtIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSRwGoP2EeWOre-0TMCmMQ" name="[1..1] range" sourceNode="_FSRvwIP2EeWOre-0TMCmMQ" targetNode="_FSRvtIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/range"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/range"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_eUcdsIWlEeWhkpx1k3JSIA" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_eUcdsYWlEeWhkpx1k3JSIA" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_eUcdsIWlEeWhkpx1k3JSIA" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_eUcdsYWlEeWhkpx1k3JSIA" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_eUcdsoWlEeWhkpx1k3JSIA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_eUcdsoWlEeWhkpx1k3JSIA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSRwHoP2EeWOre-0TMCmMQ" name="[0..*] parameters" sourceNode="_FSRvwIP2EeWOre-0TMCmMQ" targetNode="_FSRvtIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSRwHoP2EeWOre-0TMCmMQ" name="[0..*] parameters" sourceNode="_FSRvwIP2EeWOre-0TMCmMQ" targetNode="_FSRvtIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/parameters"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Function/parameters"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSRwH4P2EeWOre-0TMCmMQ" description="_FSREhIP2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSRwIIP2EeWOre-0TMCmMQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSRwH4P2EeWOre-0TMCmMQ" description="_FSREhIP2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSRwIIP2EeWOre-0TMCmMQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSRwIYP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSRwIYP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSRwKoP2EeWOre-0TMCmMQ" name="[1..1] range" sourceNode="_FSRv2IP2EeWOre-0TMCmMQ" targetNode="_FSRvtIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSRwKoP2EeWOre-0TMCmMQ" name="[1..1] range" sourceNode="_FSRv2IP2EeWOre-0TMCmMQ" targetNode="_FSRvtIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Variable/range"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Variable/range"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_e8_EYIWlEeWhkpx1k3JSIA" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_e8_EYYWlEeWhkpx1k3JSIA" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_e8_EYIWlEeWhkpx1k3JSIA" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_e8_EYYWlEeWhkpx1k3JSIA" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_e8_EYoWlEeWhkpx1k3JSIA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_e8_EYoWlEeWhkpx1k3JSIA" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSRwioP2EeWOre-0TMCmMQ" name="[0..*] parameters" sourceNode="_FSRwDoP2EeWOre-0TMCmMQ" targetNode="_FSRvtIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSRwioP2EeWOre-0TMCmMQ" name="[0..*] parameters" sourceNode="_FSRwDoP2EeWOre-0TMCmMQ" targetNode="_FSRvtIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/parameters"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/parameters"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSSoIP2EeWOre-0TMCmMQ" description="_FSREhIP2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSSoYP2EeWOre-0TMCmMQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSSoIP2EeWOre-0TMCmMQ" description="_FSREhIP2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSSoYP2EeWOre-0TMCmMQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSSooP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSSooP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSSo4P2EeWOre-0TMCmMQ" name="[1..1] type" sourceNode="_FSRwEIP2EeWOre-0TMCmMQ" targetNode="_FSRvtIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSSo4P2EeWOre-0TMCmMQ" name="[1..1] type" sourceNode="_FSRwEIP2EeWOre-0TMCmMQ" targetNode="_FSRvtIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/type"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Constant/type"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSSpIP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSSpYP2EeWOre-0TMCmMQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSSpIP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSSpYP2EeWOre-0TMCmMQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSSpoP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSSpoP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSSq4P2EeWOre-0TMCmMQ" sourceNode="_FSRvsIP2EeWOre-0TMCmMQ" targetNode="_FSRvxIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSSq4P2EeWOre-0TMCmMQ" sourceNode="_FSRvsIP2EeWOre-0TMCmMQ" targetNode="_FSRvxIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//DefinedElement/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSSrIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//DefinedElement"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSSrIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSSrYP2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSSrYP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSSroP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSSroP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSSy4P2EeWOre-0TMCmMQ" sourceNode="_FSRvwIP2EeWOre-0TMCmMQ" targetNode="_FSRvxIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSSy4P2EeWOre-0TMCmMQ" sourceNode="_FSRvwIP2EeWOre-0TMCmMQ" targetNode="_FSRvxIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Function"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Function/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSSzIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Function"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSSzIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSSzYP2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSSzYP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSSzoP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSSzoP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSS64P2EeWOre-0TMCmMQ" sourceNode="_FSRv2IP2EeWOre-0TMCmMQ" targetNode="_FSRvxIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSS64P2EeWOre-0TMCmMQ" sourceNode="_FSRv2IP2EeWOre-0TMCmMQ" targetNode="_FSRvxIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Variable/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSS7IP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSS7IP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSS7YP2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSS7YP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSS7oP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSS7oP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTR4P2EeWOre-0TMCmMQ" sourceNode="_FSRwDoP2EeWOre-0TMCmMQ" targetNode="_FSRvxIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTR4P2EeWOre-0TMCmMQ" sourceNode="_FSRwDoP2EeWOre-0TMCmMQ" targetNode="_FSRvxIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Relation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTSIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTSIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSTSYP2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSTSYP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTSoP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTSoP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTS4P2EeWOre-0TMCmMQ" sourceNode="_FSRwEIP2EeWOre-0TMCmMQ" targetNode="_FSRvxIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTS4P2EeWOre-0TMCmMQ" sourceNode="_FSRwEIP2EeWOre-0TMCmMQ" targetNode="_FSRvxIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Constant"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Constant/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTTIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Constant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTTIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSTTYP2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSTTYP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTToP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTToP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSSTT4P2EeWOre-0TMCmMQ" name="ConstantDefinition" tooltipText="" outgoingEdges="_FSSTUYP2EeWOre-0TMCmMQ _FSSTVYP2EeWOre-0TMCmMQ _FSSTiYP2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSSTT4P2EeWOre-0TMCmMQ" name="ConstantDefinition" tooltipText="" outgoingEdges="_FSSTUYP2EeWOre-0TMCmMQ _FSSTVYP2EeWOre-0TMCmMQ _FSSTiYP2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDefinition"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDefinition"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSSTUIP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSSTUIP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTUYP2EeWOre-0TMCmMQ" sourceNode="_FSSTT4P2EeWOre-0TMCmMQ" targetNode="_FSRwEIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTUYP2EeWOre-0TMCmMQ" sourceNode="_FSSTT4P2EeWOre-0TMCmMQ" targetNode="_FSRwEIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDefinition"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//ConstantDefinition/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTUoP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTUoP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSTU4P2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSTU4P2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTVIP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTVIP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTVYP2EeWOre-0TMCmMQ" name="[1..1] value" sourceNode="_FSSTT4P2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTVYP2EeWOre-0TMCmMQ" name="[1..1] value" sourceNode="_FSSTT4P2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//ConstantDefinition/value"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//ConstantDefinition/value"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTVoP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTV4P2EeWOre-0TMCmMQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTVoP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTV4P2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSTWIP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSTWIP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSSTWYP2EeWOre-0TMCmMQ" name="RelationDefinition" tooltipText="" outgoingEdges="_FSSTW4P2EeWOre-0TMCmMQ _FSSTX4P2EeWOre-0TMCmMQ _FSSTmYP2EeWOre-0TMCmMQ _FSSTnYP2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSSTWYP2EeWOre-0TMCmMQ" name="RelationDefinition" tooltipText="" outgoingEdges="_FSSTW4P2EeWOre-0TMCmMQ _FSSTX4P2EeWOre-0TMCmMQ _FSSTmYP2EeWOre-0TMCmMQ _FSSTnYP2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDefinition"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDefinition"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSSTWoP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSSTWoP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTW4P2EeWOre-0TMCmMQ" name="[0..*] variables" sourceNode="_FSSTWYP2EeWOre-0TMCmMQ" targetNode="_FSRv2IP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTW4P2EeWOre-0TMCmMQ" name="[0..*] variables" sourceNode="_FSSTWYP2EeWOre-0TMCmMQ" targetNode="_FSRv2IP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/variables"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/variables"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTXIP2EeWOre-0TMCmMQ" description="_FSREhIP2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTXYP2EeWOre-0TMCmMQ" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSTXoP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTXIP2EeWOre-0TMCmMQ" description="_FSREhIP2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTXYP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSTXoP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTX4P2EeWOre-0TMCmMQ" name="[1..1] value" sourceNode="_FSSTWYP2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTX4P2EeWOre-0TMCmMQ" name="[1..1] value" sourceNode="_FSSTWYP2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/value"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/value"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTYIP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTYYP2EeWOre-0TMCmMQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTYIP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTYYP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSTYoP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSTYoP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSSTY4P2EeWOre-0TMCmMQ" name="FunctionDefinition" tooltipText="" outgoingEdges="_FSSTZYP2EeWOre-0TMCmMQ _FSSTaYP2EeWOre-0TMCmMQ _FSSToYP2EeWOre-0TMCmMQ _FSSTbYP2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSSTY4P2EeWOre-0TMCmMQ" name="FunctionDefinition" tooltipText="" outgoingEdges="_FSSTZYP2EeWOre-0TMCmMQ _FSSTaYP2EeWOre-0TMCmMQ _FSSToYP2EeWOre-0TMCmMQ _FSSTbYP2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDefinition"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDefinition"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSSTZIP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSSTZIP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTZYP2EeWOre-0TMCmMQ" sourceNode="_FSSTY4P2EeWOre-0TMCmMQ" targetNode="_FSRvwIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTZYP2EeWOre-0TMCmMQ" sourceNode="_FSSTY4P2EeWOre-0TMCmMQ" targetNode="_FSRvwIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDefinition"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//FunctionDefinition/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTZoP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTZoP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSTZ4P2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSTZ4P2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTaIP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTaIP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTaYP2EeWOre-0TMCmMQ" name="[0..*] variable" sourceNode="_FSSTY4P2EeWOre-0TMCmMQ" targetNode="_FSRv2IP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTaYP2EeWOre-0TMCmMQ" name="[0..*] variable" sourceNode="_FSSTY4P2EeWOre-0TMCmMQ" targetNode="_FSRv2IP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/variable"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/variable"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTaoP2EeWOre-0TMCmMQ" description="_FSREhIP2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTa4P2EeWOre-0TMCmMQ" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSTbIP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTaoP2EeWOre-0TMCmMQ" description="_FSREhIP2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTa4P2EeWOre-0TMCmMQ" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSTbIP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTbYP2EeWOre-0TMCmMQ" name="[1..1] value" sourceNode="_FSSTY4P2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTbYP2EeWOre-0TMCmMQ" name="[1..1] value" sourceNode="_FSSTY4P2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/value"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/value"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTboP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTb4P2EeWOre-0TMCmMQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTboP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTb4P2EeWOre-0TMCmMQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSTcIP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSTcIP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSSTcYP2EeWOre-0TMCmMQ" name="IfThenElse" tooltipText="" outgoingEdges="_FSSTc4P2EeWOre-0TMCmMQ _FSSTd4P2EeWOre-0TMCmMQ _FSSTe4P2EeWOre-0TMCmMQ _FSSTf4P2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSSTcYP2EeWOre-0TMCmMQ" name="IfThenElse" tooltipText="" outgoingEdges="_FSSTc4P2EeWOre-0TMCmMQ _FSSTd4P2EeWOre-0TMCmMQ _FSSTe4P2EeWOre-0TMCmMQ _FSSTf4P2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSSTcoP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSSTcoP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTc4P2EeWOre-0TMCmMQ" name="[1..1] condition" sourceNode="_FSSTcYP2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTc4P2EeWOre-0TMCmMQ" name="[1..1] condition" sourceNode="_FSSTcYP2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/condition"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/condition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTdIP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTdYP2EeWOre-0TMCmMQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTdIP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTdYP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSTdoP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSTdoP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTd4P2EeWOre-0TMCmMQ" sourceNode="_FSSTcYP2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTd4P2EeWOre-0TMCmMQ" sourceNode="_FSSTcYP2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//IfThenElse/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTeIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTeIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSTeYP2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSTeYP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTeoP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTeoP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTe4P2EeWOre-0TMCmMQ" name="[1..1] ifTrue" sourceNode="_FSSTcYP2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTe4P2EeWOre-0TMCmMQ" name="[1..1] ifTrue" sourceNode="_FSSTcYP2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifTrue"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifTrue"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTfIP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTfYP2EeWOre-0TMCmMQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTfIP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTfYP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSTfoP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSTfoP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTf4P2EeWOre-0TMCmMQ" name="[1..1] ifFalse" sourceNode="_FSSTcYP2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTf4P2EeWOre-0TMCmMQ" name="[1..1] ifFalse" sourceNode="_FSSTcYP2EeWOre-0TMCmMQ" targetNode="_FSRvwoP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifFalse"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifFalse"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTgIP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTgYP2EeWOre-0TMCmMQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTgIP2EeWOre-0TMCmMQ" description="_FSREh4P2EeWOre-0TMCmMQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTgYP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSTgoP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSTgoP2EeWOre-0TMCmMQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSSTg4P2EeWOre-0TMCmMQ" name="ConstantDeclaration" tooltipText="" outgoingEdges="_FSSThYP2EeWOre-0TMCmMQ" incomingEdges="_FSSTiYP2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSSTg4P2EeWOre-0TMCmMQ" name="ConstantDeclaration" tooltipText="" outgoingEdges="_FSSThYP2EeWOre-0TMCmMQ" incomingEdges="_FSSTiYP2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSSThIP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSSThIP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSThYP2EeWOre-0TMCmMQ" sourceNode="_FSSTg4P2EeWOre-0TMCmMQ" targetNode="_FSRwEIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSThYP2EeWOre-0TMCmMQ" sourceNode="_FSSTg4P2EeWOre-0TMCmMQ" targetNode="_FSRwEIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDeclaration"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//ConstantDeclaration/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSThoP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ConstantDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSThoP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSTh4P2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSTh4P2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTiIP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTiIP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTiYP2EeWOre-0TMCmMQ" name="[0..1] defines" sourceNode="_FSSTT4P2EeWOre-0TMCmMQ" targetNode="_FSSTg4P2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTiYP2EeWOre-0TMCmMQ" name="[0..1] defines" sourceNode="_FSSTT4P2EeWOre-0TMCmMQ" targetNode="_FSSTg4P2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//ConstantDefinition/defines"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//ConstantDefinition/defines"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTioP2EeWOre-0TMCmMQ" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTioP2EeWOre-0TMCmMQ" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTi4P2EeWOre-0TMCmMQ" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTi4P2EeWOre-0TMCmMQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSTjIP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSTjIP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSSTjYP2EeWOre-0TMCmMQ" name="RelationDeclaration" tooltipText="" outgoingEdges="_FSSTj4P2EeWOre-0TMCmMQ" incomingEdges="_FSSTnYP2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSSTjYP2EeWOre-0TMCmMQ" name="RelationDeclaration" tooltipText="" outgoingEdges="_FSSTj4P2EeWOre-0TMCmMQ" incomingEdges="_FSSTnYP2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_FSSTjoP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_FSSTjoP2EeWOre-0TMCmMQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTj4P2EeWOre-0TMCmMQ" sourceNode="_FSSTjYP2EeWOre-0TMCmMQ" targetNode="_FSRwDoP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTj4P2EeWOre-0TMCmMQ" sourceNode="_FSSTjYP2EeWOre-0TMCmMQ" targetNode="_FSRwDoP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDeclaration"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//RelationDeclaration/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTkIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTkIP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSTkYP2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSTkYP2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTkoP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTkoP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_FSSTk4P2EeWOre-0TMCmMQ" name="FunctionDeclaration" tooltipText="" outgoingEdges="_FSSTlYP2EeWOre-0TMCmMQ" incomingEdges="_FSSToYP2EeWOre-0TMCmMQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_FSSTk4P2EeWOre-0TMCmMQ" name="FunctionDeclaration" tooltipText="" outgoingEdges="_FSSTlYP2EeWOre-0TMCmMQ" incomingEdges="_FSSToYP2EeWOre-0TMCmMQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_e5PFILXHEeamG-Ij7YnW7w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_e5PFILXHEeamG-Ij7YnW7w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTlYP2EeWOre-0TMCmMQ" sourceNode="_FSSTk4P2EeWOre-0TMCmMQ" targetNode="_FSRvwIP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTlYP2EeWOre-0TMCmMQ" sourceNode="_FSSTk4P2EeWOre-0TMCmMQ" targetNode="_FSRvwIP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDeclaration"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//FunctionDeclaration/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTloP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//FunctionDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTloP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSTl4P2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSTl4P2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTmIP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTmIP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTmYP2EeWOre-0TMCmMQ" sourceNode="_FSSTWYP2EeWOre-0TMCmMQ" targetNode="_FSRwDoP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTmYP2EeWOre-0TMCmMQ" sourceNode="_FSSTWYP2EeWOre-0TMCmMQ" targetNode="_FSRwDoP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDefinition"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//RelationDefinition/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTmoP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RelationDefinition"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTmoP2EeWOre-0TMCmMQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_FSSTm4P2EeWOre-0TMCmMQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_FSSTm4P2EeWOre-0TMCmMQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTnIP2EeWOre-0TMCmMQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTnIP2EeWOre-0TMCmMQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSTnYP2EeWOre-0TMCmMQ" name="[0..1] defines" sourceNode="_FSSTWYP2EeWOre-0TMCmMQ" targetNode="_FSSTjYP2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSTnYP2EeWOre-0TMCmMQ" name="[0..1] defines" sourceNode="_FSSTWYP2EeWOre-0TMCmMQ" targetNode="_FSSTjYP2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/defines"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//RelationDefinition/defines"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTnoP2EeWOre-0TMCmMQ" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTnoP2EeWOre-0TMCmMQ" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTn4P2EeWOre-0TMCmMQ" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTn4P2EeWOre-0TMCmMQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSToIP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSToIP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_FSSToYP2EeWOre-0TMCmMQ" name="[0..1] defines" sourceNode="_FSSTY4P2EeWOre-0TMCmMQ" targetNode="_FSSTk4P2EeWOre-0TMCmMQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_FSSToYP2EeWOre-0TMCmMQ" name="[0..1] defines" sourceNode="_FSSTY4P2EeWOre-0TMCmMQ" targetNode="_FSSTk4P2EeWOre-0TMCmMQ">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/defines"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//FunctionDefinition/defines"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_FSSTooP2EeWOre-0TMCmMQ" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_FSSTooP2EeWOre-0TMCmMQ" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_FSSTo4P2EeWOre-0TMCmMQ" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FSSTo4P2EeWOre-0TMCmMQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_FSSTpIP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_FSSTpIP2EeWOre-0TMCmMQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_FSSTs4P2EeWOre-0TMCmMQ"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_FSSTs4P2EeWOre-0TMCmMQ"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
     <target xmi:type="ecore:EPackage" href="logiclanguage.ecore#/"/>
   </diagram:DSemanticDiagram>
-  <diagram:DSemanticDiagram xmi:id="_LobkUAJFEea4lsNl5Yuy6Q" name="LogicResult" uid="_TDxLsG7rEeifqZoaQeIEkw">
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_LobkUQJFEea4lsNl5Yuy6Q" source="DANNOTATION_CUSTOMIZATION_KEY">
-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_LobkUgJFEea4lsNl5Yuy6Q">
+  <diagram:DSemanticDiagram uid="_LobkUAJFEea4lsNl5Yuy6Q" name="LogicResult">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_LobkUQJFEea4lsNl5Yuy6Q" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_LobkUgJFEea4lsNl5Yuy6Q">
         <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_LobkUwJFEea4lsNl5Yuy6Q" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
           <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <labelFormat>bold</labelFormat>
@@ -6566,7 +6681,7 @@
         </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_LobkXQJFEea4lsNl5Yuy6Q" source="GMF_DIAGRAMS">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_LobkXQJFEea4lsNl5Yuy6Q" source="GMF_DIAGRAMS">
       <data xmi:type="notation:Diagram" xmi:id="_LobkXgJFEea4lsNl5Yuy6Q" type="Sirius" element="_LobkUAJFEea4lsNl5Yuy6Q" measurementUnit="Pixel">
         <children xmi:type="notation:Node" xmi:id="_MZ2toBIREeaMQsIXDIF-zQ" type="2003" element="_MYQLIBIREeaMQsIXDIF-zQ">
           <children xmi:type="notation:Node" xmi:id="_MZ3UsBIREeaMQsIXDIF-zQ" type="5007"/>
@@ -6579,6 +6694,10 @@
               <styles xmi:type="notation:FontStyle" xmi:id="_MaC64RIREeaMQsIXDIF-zQ" fontName="Segoe UI" fontHeight="8" bold="true"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_MaC64hIREeaMQsIXDIF-zQ"/>
             </children>
+            <children xmi:type="notation:Node" xmi:id="_1i85wG6hEemSyfDlsGAqLA" type="3010" element="_1i2MEm6hEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_1i85wW6hEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_1i9g0G6hEemSyfDlsGAqLA"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_MZ37wRIREeaMQsIXDIF-zQ"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_MZ37whIREeaMQsIXDIF-zQ"/>
           </children>
@@ -6878,371 +6997,403 @@
         </edges>
       </data>
     </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYQLIBIREeaMQsIXDIF-zQ" name="LogicResult" tooltipText="" outgoingEdges="_MZdsEBIREeaMQsIXDIF-zQ" incomingEdges="_MZorMBIREeaMQsIXDIF-zQ _MZp5UBIREeaMQsIXDIF-zQ _MZqgYBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYQLIBIREeaMQsIXDIF-zQ" name="LogicResult" tooltipText="" outgoingEdges="_MZdsEBIREeaMQsIXDIF-zQ" incomingEdges="_MZorMBIREeaMQsIXDIF-zQ _MZp5UBIREeaMQsIXDIF-zQ _MZqgYBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//LogicResult"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//LogicResult"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNZBIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNZBIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYQLIRIREeaMQsIXDIF-zQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYQLIRIREeaMQsIXDIF-zQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZAZEBIREeaMQsIXDIF-zQ" name="trace : EJavaObject" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZAZEBIREeaMQsIXDIF-zQ" name="trace : EJavaObject" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//LogicResult/trace"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//LogicResult/trace"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZAZERIREeaMQsIXDIF-zQ" labelAlignment="LEFT">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZAZERIREeaMQsIXDIF-zQ" labelAlignment="LEFT">
           <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZBAIBIREeaMQsIXDIF-zQ" name="representation : EJavaObject" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZBAIBIREeaMQsIXDIF-zQ" name="representation : EJavaObject" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//LogicResult/representation"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//LogicResult/representation"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZBnMBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
-          <labelFormat>bold</labelFormat>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_1i2MEW6hEemSyfDlsGAqLA" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_1i2MEm6hEemSyfDlsGAqLA" name=" problem : LogicProblem" tooltipText="">
+        <target xmi:type="ecore:EReference" href="logicresult.ecore#//LogicResult/problem"/>
+        <semanticElements xmi:type="ecore:EReference" href="logicresult.ecore#//LogicResult/problem"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_1i2ME26hEemSyfDlsGAqLA" labelAlignment="LEFT" color="114,159,207">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
+      </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYWRwBIREeaMQsIXDIF-zQ" name="ModelResult" tooltipText="" outgoingEdges="_MZorMBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYWRwBIREeaMQsIXDIF-zQ" name="ModelResult" tooltipText="" outgoingEdges="_MZorMBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//ModelResult"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//ModelResult"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNZRIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNZRIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYXf4BIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYXf4BIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZCOQBIREeaMQsIXDIF-zQ" name="maxInteger : EInt" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZCOQBIREeaMQsIXDIF-zQ" name="maxInteger : EInt" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//ModelResult/maxInteger"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//ModelResult/maxInteger"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZDcYBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZDcYBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZDcYRIREeaMQsIXDIF-zQ" name="minInteger : EInt" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZDcYRIREeaMQsIXDIF-zQ" name="minInteger : EInt" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//ModelResult/minInteger"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//ModelResult/minInteger"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZF4oBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZF4oBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYYuABIREeaMQsIXDIF-zQ" name="InconsistencyResult" tooltipText="" outgoingEdges="_MZp5UBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYYuABIREeaMQsIXDIF-zQ" name="InconsistencyResult" tooltipText="" outgoingEdges="_MZp5UBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//InconsistencyResult"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//InconsistencyResult"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNZhIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNZhIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYYuARIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYYuARIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYZVEBIREeaMQsIXDIF-zQ" name="UnknownResult" tooltipText="" outgoingEdges="_MZqgYBIREeaMQsIXDIF-zQ" incomingEdges="_MZrHcBIREeaMQsIXDIF-zQ _MZrugBIREeaMQsIXDIF-zQ _MZsVkBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYZVEBIREeaMQsIXDIF-zQ" name="UnknownResult" tooltipText="" outgoingEdges="_MZqgYBIREeaMQsIXDIF-zQ" incomingEdges="_MZrHcBIREeaMQsIXDIF-zQ _MZrugBIREeaMQsIXDIF-zQ _MZsVkBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//UnknownResult"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//UnknownResult"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNZxIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNZxIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYZVERIREeaMQsIXDIF-zQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYZVERIREeaMQsIXDIF-zQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYZ8IBIREeaMQsIXDIF-zQ" name="InsuficientResourcesResult" tooltipText="" outgoingEdges="_MZrHcBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYZ8IBIREeaMQsIXDIF-zQ" name="InsuficientResourcesResult" tooltipText="" outgoingEdges="_MZrHcBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//InsuficientResourcesResult"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//InsuficientResourcesResult"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNaBIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNaBIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYajMBIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYajMBIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZGfsBIREeaMQsIXDIF-zQ" name="resourceName : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZGfsBIREeaMQsIXDIF-zQ" name="resourceName : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//InsuficientResourcesResult/resourceName"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//InsuficientResourcesResult/resourceName"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZHGwBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZHGwBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYbKQBIREeaMQsIXDIF-zQ" name="ErrorResult" tooltipText="" outgoingEdges="_MZrugBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYbKQBIREeaMQsIXDIF-zQ" name="ErrorResult" tooltipText="" outgoingEdges="_MZrugBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//ErrorResult"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//ErrorResult"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNaRIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNaRIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYbKQRIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYbKQRIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZIU4BIREeaMQsIXDIF-zQ" name="message : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZIU4BIREeaMQsIXDIF-zQ" name="message : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//ErrorResult/message"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//ErrorResult/message"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZI78BIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZI78BIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYbxUBIREeaMQsIXDIF-zQ" name="Statistics" tooltipText="" outgoingEdges="_MZe6MBIREeaMQsIXDIF-zQ" incomingEdges="_MZdsEBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYbxUBIREeaMQsIXDIF-zQ" name="Statistics" tooltipText="" outgoingEdges="_MZe6MBIREeaMQsIXDIF-zQ" incomingEdges="_MZdsEBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//Statistics"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//Statistics"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNahIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNahIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYcYYBIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYcYYBIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZJjABIREeaMQsIXDIF-zQ" name="transformationTime : EInt = -1" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZJjABIREeaMQsIXDIF-zQ" name="transformationTime : EInt = -1" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//Statistics/transformationTime"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//Statistics/transformationTime"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZJjARIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZJjARIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZKKEBIREeaMQsIXDIF-zQ" name="solverTime : EInt = -1" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZKKEBIREeaMQsIXDIF-zQ" name="solverTime : EInt = -1" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//Statistics/solverTime"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//Statistics/solverTime"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZKxIBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZKxIBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZLYMBIREeaMQsIXDIF-zQ" name="solverMemory : EInt = -1" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZLYMBIREeaMQsIXDIF-zQ" name="solverMemory : EInt = -1" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//Statistics/solverMemory"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//Statistics/solverMemory"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZLYMRIREeaMQsIXDIF-zQ" labelAlignment="LEFT">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZLYMRIREeaMQsIXDIF-zQ" labelAlignment="LEFT">
           <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYcYYRIREeaMQsIXDIF-zQ" name="StatisticEntry" tooltipText="" incomingEdges="_MZe6MBIREeaMQsIXDIF-zQ _MZs8oBIREeaMQsIXDIF-zQ _MZtjsBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYcYYRIREeaMQsIXDIF-zQ" name="StatisticEntry" tooltipText="" incomingEdges="_MZe6MBIREeaMQsIXDIF-zQ _MZs8oBIREeaMQsIXDIF-zQ _MZtjsBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//StatisticEntry"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//StatisticEntry"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNaxIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNaxIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYcYYhIREeaMQsIXDIF-zQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYcYYhIREeaMQsIXDIF-zQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZL_QBIREeaMQsIXDIF-zQ" name="name : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZL_QBIREeaMQsIXDIF-zQ" name="name : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//StatisticEntry/name"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//StatisticEntry/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZMmUBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZMmUBIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYcYYxIREeaMQsIXDIF-zQ" name="UndecidableResult" tooltipText="" outgoingEdges="_MZsVkBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYcYYxIREeaMQsIXDIF-zQ" name="UndecidableResult" tooltipText="" outgoingEdges="_MZsVkBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//UndecidableResult"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//UndecidableResult"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNbBIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNbBIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYcYZBIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYcYZBIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYcYZRIREeaMQsIXDIF-zQ" name="IntStatisticEntry" tooltipText="" outgoingEdges="_MZs8oBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYcYZRIREeaMQsIXDIF-zQ" name="IntStatisticEntry" tooltipText="" outgoingEdges="_MZs8oBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//IntStatisticEntry"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//IntStatisticEntry"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNbRIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNbRIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYcYZhIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYcYZhIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZNNYBIREeaMQsIXDIF-zQ" name="value : EInt" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZNNYBIREeaMQsIXDIF-zQ" name="value : EInt" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//IntStatisticEntry/value"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//IntStatisticEntry/value"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZNNYRIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZNNYRIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_MYcYZxIREeaMQsIXDIF-zQ" name="RealStatisticEntry" tooltipText="" outgoingEdges="_MZtjsBIREeaMQsIXDIF-zQ" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MYcYZxIREeaMQsIXDIF-zQ" name="RealStatisticEntry" tooltipText="" outgoingEdges="_MZtjsBIREeaMQsIXDIF-zQ" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//RealStatisticEntry"/>
       <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//RealStatisticEntry"/>
-      <decorations xmi:type="viewpoint:Decoration" xmi:id="_MZNNbhIREeaMQsIXDIF-zQ">
+      <decorations xmi:type="viewpoint:Decoration" uid="_MZNNbhIREeaMQsIXDIF-zQ">
         <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
       </decorations>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_MYcYaBIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MYcYaBIREeaMQsIXDIF-zQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_MZNNYhIREeaMQsIXDIF-zQ" name="value : EDouble = 0.0" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MZNNYhIREeaMQsIXDIF-zQ" name="value : EDouble = 0.0" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logicresult.ecore#//RealStatisticEntry/value"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logicresult.ecore#//RealStatisticEntry/value"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_MZNNYxIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_MZNNYxIREeaMQsIXDIF-zQ" labelAlignment="LEFT" description="_LobkUwJFEea4lsNl5Yuy6Q">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MZdsEBIREeaMQsIXDIF-zQ" name="[0..1] statistics" sourceNode="_MYQLIBIREeaMQsIXDIF-zQ" targetNode="_MYbxUBIREeaMQsIXDIF-zQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_MZdsEBIREeaMQsIXDIF-zQ" name="[0..1] statistics" sourceNode="_MYQLIBIREeaMQsIXDIF-zQ" targetNode="_MYbxUBIREeaMQsIXDIF-zQ">
       <target xmi:type="ecore:EReference" href="logicresult.ecore#//LogicResult/statistics"/>
       <semanticElements xmi:type="ecore:EReference" href="logicresult.ecore#//LogicResult/statistics"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MZeTIBIREeaMQsIXDIF-zQ" description="_LobkVAJFEea4lsNl5Yuy6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MZeTIRIREeaMQsIXDIF-zQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MZeTIBIREeaMQsIXDIF-zQ" description="_LobkVAJFEea4lsNl5Yuy6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MZeTIRIREeaMQsIXDIF-zQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_MZeTIhIREeaMQsIXDIF-zQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_MZeTIhIREeaMQsIXDIF-zQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MZe6MBIREeaMQsIXDIF-zQ" name="[0..*] entries" sourceNode="_MYbxUBIREeaMQsIXDIF-zQ" targetNode="_MYcYYRIREeaMQsIXDIF-zQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_MZe6MBIREeaMQsIXDIF-zQ" name="[0..*] entries" sourceNode="_MYbxUBIREeaMQsIXDIF-zQ" targetNode="_MYcYYRIREeaMQsIXDIF-zQ">
       <target xmi:type="ecore:EReference" href="logicresult.ecore#//Statistics/entries"/>
       <semanticElements xmi:type="ecore:EReference" href="logicresult.ecore#//Statistics/entries"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MZfhQBIREeaMQsIXDIF-zQ" description="_LobkVAJFEea4lsNl5Yuy6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MZfhQRIREeaMQsIXDIF-zQ" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MZfhQBIREeaMQsIXDIF-zQ" description="_LobkVAJFEea4lsNl5Yuy6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MZfhQRIREeaMQsIXDIF-zQ" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_MZfhQhIREeaMQsIXDIF-zQ" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_MZfhQhIREeaMQsIXDIF-zQ" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MZorMBIREeaMQsIXDIF-zQ" sourceNode="_MYWRwBIREeaMQsIXDIF-zQ" targetNode="_MYQLIBIREeaMQsIXDIF-zQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_MZorMBIREeaMQsIXDIF-zQ" sourceNode="_MYWRwBIREeaMQsIXDIF-zQ" targetNode="_MYQLIBIREeaMQsIXDIF-zQ">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//ModelResult"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicresult.ecore#//ModelResult/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MZpSQBIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//ModelResult"/>
+      <decorations xmi:type="viewpoint:Decoration" uid="_1i6dhm6hEemSyfDlsGAqLA">
+        <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
+      </decorations>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MZpSQBIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MZpSQRIREeaMQsIXDIF-zQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_MZpSQRIREeaMQsIXDIF-zQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MZpSQhIREeaMQsIXDIF-zQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MZpSQhIREeaMQsIXDIF-zQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MZp5UBIREeaMQsIXDIF-zQ" sourceNode="_MYYuABIREeaMQsIXDIF-zQ" targetNode="_MYQLIBIREeaMQsIXDIF-zQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_MZp5UBIREeaMQsIXDIF-zQ" sourceNode="_MYYuABIREeaMQsIXDIF-zQ" targetNode="_MYQLIBIREeaMQsIXDIF-zQ">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//InconsistencyResult"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicresult.ecore#//InconsistencyResult/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MZp5URIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//InconsistencyResult"/>
+      <decorations xmi:type="viewpoint:Decoration" uid="_1i6djW6hEemSyfDlsGAqLA">
+        <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
+      </decorations>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MZp5URIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MZp5UhIREeaMQsIXDIF-zQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_MZp5UhIREeaMQsIXDIF-zQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MZp5UxIREeaMQsIXDIF-zQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MZp5UxIREeaMQsIXDIF-zQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MZqgYBIREeaMQsIXDIF-zQ" sourceNode="_MYZVEBIREeaMQsIXDIF-zQ" targetNode="_MYQLIBIREeaMQsIXDIF-zQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_MZqgYBIREeaMQsIXDIF-zQ" sourceNode="_MYZVEBIREeaMQsIXDIF-zQ" targetNode="_MYQLIBIREeaMQsIXDIF-zQ">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//UnknownResult"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicresult.ecore#//UnknownResult/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MZqgYRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//UnknownResult"/>
+      <decorations xmi:type="viewpoint:Decoration" uid="_1i7Elm6hEemSyfDlsGAqLA">
+        <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
+      </decorations>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MZqgYRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MZqgYhIREeaMQsIXDIF-zQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_MZqgYhIREeaMQsIXDIF-zQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MZqgYxIREeaMQsIXDIF-zQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MZqgYxIREeaMQsIXDIF-zQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MZrHcBIREeaMQsIXDIF-zQ" sourceNode="_MYZ8IBIREeaMQsIXDIF-zQ" targetNode="_MYZVEBIREeaMQsIXDIF-zQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_MZrHcBIREeaMQsIXDIF-zQ" sourceNode="_MYZ8IBIREeaMQsIXDIF-zQ" targetNode="_MYZVEBIREeaMQsIXDIF-zQ">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//InsuficientResourcesResult"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicresult.ecore#//InsuficientResourcesResult/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MZrHcRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//InsuficientResourcesResult"/>
+      <decorations xmi:type="viewpoint:Decoration" uid="_1i7EnW6hEemSyfDlsGAqLA">
+        <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
+      </decorations>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MZrHcRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MZrHchIREeaMQsIXDIF-zQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_MZrHchIREeaMQsIXDIF-zQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MZrHcxIREeaMQsIXDIF-zQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MZrHcxIREeaMQsIXDIF-zQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MZrugBIREeaMQsIXDIF-zQ" sourceNode="_MYbKQBIREeaMQsIXDIF-zQ" targetNode="_MYZVEBIREeaMQsIXDIF-zQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_MZrugBIREeaMQsIXDIF-zQ" sourceNode="_MYbKQBIREeaMQsIXDIF-zQ" targetNode="_MYZVEBIREeaMQsIXDIF-zQ">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//ErrorResult"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicresult.ecore#//ErrorResult/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MZrugRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//ErrorResult"/>
+      <decorations xmi:type="viewpoint:Decoration" uid="_1i7EpG6hEemSyfDlsGAqLA">
+        <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
+      </decorations>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MZrugRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MZrughIREeaMQsIXDIF-zQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_MZrughIREeaMQsIXDIF-zQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MZrugxIREeaMQsIXDIF-zQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MZrugxIREeaMQsIXDIF-zQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MZsVkBIREeaMQsIXDIF-zQ" sourceNode="_MYcYYxIREeaMQsIXDIF-zQ" targetNode="_MYZVEBIREeaMQsIXDIF-zQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_MZsVkBIREeaMQsIXDIF-zQ" sourceNode="_MYcYYxIREeaMQsIXDIF-zQ" targetNode="_MYZVEBIREeaMQsIXDIF-zQ">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//UndecidableResult"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicresult.ecore#//UndecidableResult/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MZsVkRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//UndecidableResult"/>
+      <decorations xmi:type="viewpoint:Decoration" uid="_1i7Eq26hEemSyfDlsGAqLA">
+        <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
+      </decorations>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MZsVkRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MZsVkhIREeaMQsIXDIF-zQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_MZsVkhIREeaMQsIXDIF-zQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MZsVkxIREeaMQsIXDIF-zQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MZsVkxIREeaMQsIXDIF-zQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MZs8oBIREeaMQsIXDIF-zQ" sourceNode="_MYcYZRIREeaMQsIXDIF-zQ" targetNode="_MYcYYRIREeaMQsIXDIF-zQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_MZs8oBIREeaMQsIXDIF-zQ" sourceNode="_MYcYZRIREeaMQsIXDIF-zQ" targetNode="_MYcYYRIREeaMQsIXDIF-zQ">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//IntStatisticEntry"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicresult.ecore#//IntStatisticEntry/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MZs8oRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//IntStatisticEntry"/>
+      <decorations xmi:type="viewpoint:Decoration" uid="_1i7rpm6hEemSyfDlsGAqLA">
+        <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
+      </decorations>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MZs8oRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MZs8ohIREeaMQsIXDIF-zQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_MZs8ohIREeaMQsIXDIF-zQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MZs8oxIREeaMQsIXDIF-zQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MZs8oxIREeaMQsIXDIF-zQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_MZtjsBIREeaMQsIXDIF-zQ" sourceNode="_MYcYZxIREeaMQsIXDIF-zQ" targetNode="_MYcYYRIREeaMQsIXDIF-zQ">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_MZtjsBIREeaMQsIXDIF-zQ" sourceNode="_MYcYZxIREeaMQsIXDIF-zQ" targetNode="_MYcYYRIREeaMQsIXDIF-zQ">
       <target xmi:type="ecore:EClass" href="logicresult.ecore#//RealStatisticEntry"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logicresult.ecore#//RealStatisticEntry/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_MZtjsRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logicresult.ecore#//RealStatisticEntry"/>
+      <decorations xmi:type="viewpoint:Decoration" uid="_1i7rrW6hEemSyfDlsGAqLA">
+        <description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
+      </decorations>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_MZtjsRIREeaMQsIXDIF-zQ" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_MZtjshIREeaMQsIXDIF-zQ" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_MZtjshIREeaMQsIXDIF-zQ" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_MZtjsxIREeaMQsIXDIF-zQ" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_MZtjsxIREeaMQsIXDIF-zQ" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_Lof2PAJFEea4lsNl5Yuy6Q"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_Lof2PAJFEea4lsNl5Yuy6Q"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
     <target xmi:type="ecore:EPackage" href="logiclanguage.ecore#/"/>
   </diagram:DSemanticDiagram>
-  <diagram:DSemanticDiagram xmi:id="_l6XRgLdnEeau1vMV3Bsx4w" name="Terms" uid="_TD8K0G7rEeifqZoaQeIEkw">
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_l6XRgbdnEeau1vMV3Bsx4w" source="DANNOTATION_CUSTOMIZATION_KEY">
-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" xmi:id="_l6XRgrdnEeau1vMV3Bsx4w">
+  <diagram:DSemanticDiagram uid="_l6XRgLdnEeau1vMV3Bsx4w" name="Terms">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_l6XRgbdnEeau1vMV3Bsx4w" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_l6XRgrdnEeau1vMV3Bsx4w">
         <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan">
           <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_l6XRhbdnEeau1vMV3Bsx4w" showIcon="false" labelExpression="service:render">
@@ -7270,7 +7421,7 @@
         </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" xmi:id="_l6XRjbdnEeau1vMV3Bsx4w" source="GMF_DIAGRAMS">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_l6XRjbdnEeau1vMV3Bsx4w" source="GMF_DIAGRAMS">
       <data xmi:type="notation:Diagram" xmi:id="_l6XRjrdnEeau1vMV3Bsx4w" type="Sirius" element="_l6XRgLdnEeau1vMV3Bsx4w" measurementUnit="Pixel">
         <children xmi:type="notation:Node" xmi:id="_l6XR27dnEeau1vMV3Bsx4w" type="2003" element="_l6ZIGbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XR3LdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7279,7 +7430,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XR37dnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XR4LdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XR4bdnEeau1vMV3Bsx4w" x="1630" y="58"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XR4bdnEeau1vMV3Bsx4w" x="1080" y="-72" height="315"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XR7LdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIH7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XR7bdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7288,7 +7439,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XR8LdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XR8bdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XR8rdnEeau1vMV3Bsx4w" x="2245" y="210"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XR8rdnEeau1vMV3Bsx4w" x="1536" y="362" height="41"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XR87dnEeau1vMV3Bsx4w" type="2003" element="_l6ZIIbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XR9LdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7297,7 +7448,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XR97dnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XR-LdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XR-bdnEeau1vMV3Bsx4w" x="1015" y="322"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XR-bdnEeau1vMV3Bsx4w" x="-996" y="348" height="8"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XR-rdnEeau1vMV3Bsx4w" type="2003" element="_l6ZII7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XR-7dnEeau1vMV3Bsx4w" type="5007"/>
@@ -7310,7 +7461,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSAbdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSArdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSA7dnEeau1vMV3Bsx4w" x="1165" y="455" height="53"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSA7dnEeau1vMV3Bsx4w" x="-1200" y="460" height="53"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSBLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIJ7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSBbdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7323,7 +7474,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSC7dnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSDLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSDbdnEeau1vMV3Bsx4w" x="981" y="460" height="53"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSDbdnEeau1vMV3Bsx4w" x="-948" y="460" height="53"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSDrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIK7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSD7dnEeau1vMV3Bsx4w" type="5007"/>
@@ -7336,7 +7487,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSFbdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSFrdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSF7dnEeau1vMV3Bsx4w" x="835" y="454" height="53"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSF7dnEeau1vMV3Bsx4w" x="-1082" y="460" height="53"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSGLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIL7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSGbdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7345,7 +7496,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSHLdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSHbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSHrdnEeau1vMV3Bsx4w" x="1760" y="440"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSHrdnEeau1vMV3Bsx4w" x="1956" y="456" height="36"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSH7dnEeau1vMV3Bsx4w" type="2003" element="_l6ZIMbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSILdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7354,7 +7505,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSI7dnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSJLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSJbdnEeau1vMV3Bsx4w" x="1450" y="275"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSJbdnEeau1vMV3Bsx4w" x="1788" y="362" height="35"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSJrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIM7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSJ7dnEeau1vMV3Bsx4w" type="5007"/>
@@ -7363,7 +7514,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSKrdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSK7dnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSLLdnEeau1vMV3Bsx4w" x="1345" y="455"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSLLdnEeau1vMV3Bsx4w" x="1764" y="441" width="79" height="20"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSLbdnEeau1vMV3Bsx4w" type="2003" element="_l6ZINbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSLrdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7372,7 +7523,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSMbdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSMrdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSM7dnEeau1vMV3Bsx4w" x="1525" y="455"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSM7dnEeau1vMV3Bsx4w" x="1848" y="441" width="81" height="20"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSNLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIN7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSNbdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7381,7 +7532,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSOLdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSObdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSOrdnEeau1vMV3Bsx4w" x="-500" y="460"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSOrdnEeau1vMV3Bsx4w" x="-552" y="360" width="100" height="46"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSO7dnEeau1vMV3Bsx4w" type="2003" element="_l6ZIObdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSPLdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7390,7 +7541,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSP7dnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSQLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSQbdnEeau1vMV3Bsx4w" x="-750" y="644" height="37"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSQbdnEeau1vMV3Bsx4w" x="-661" y="460" width="79" height="37"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSQrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIO7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSQ7dnEeau1vMV3Bsx4w" type="5007"/>
@@ -7399,7 +7550,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSRrdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSR7dnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSSLdnEeau1vMV3Bsx4w" x="-460" y="650" height="44"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSSLdnEeau1vMV3Bsx4w" x="-577" y="459" width="79" height="44"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSSbdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIPbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSSrdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7408,7 +7559,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSTbdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSTrdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XST7dnEeau1vMV3Bsx4w" x="-880" y="650" height="44"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XST7dnEeau1vMV3Bsx4w" x="-493" y="459" width="79" height="44"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSULdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIP7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSUbdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7417,7 +7568,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSVLdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSVbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSVrdnEeau1vMV3Bsx4w" x="-610" y="650" height="44"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSVrdnEeau1vMV3Bsx4w" x="-409" y="459" width="79" height="44"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSV7dnEeau1vMV3Bsx4w" type="2003" element="_l6ZIQbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSWLdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7426,7 +7577,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSW7dnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSXLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSXbdnEeau1vMV3Bsx4w" x="-280" y="650" height="44"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSXbdnEeau1vMV3Bsx4w" x="-328" y="459" width="79" height="44"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSXrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIQ7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSX7dnEeau1vMV3Bsx4w" type="5007"/>
@@ -7435,7 +7586,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSYrdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSY7dnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSZLdnEeau1vMV3Bsx4w" x="2460" y="720"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSZLdnEeau1vMV3Bsx4w" x="564" y="360" width="111" height="45"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSZbdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIRbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSZrdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7444,7 +7595,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XSabdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XSardnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSa7dnEeau1vMV3Bsx4w" x="2905" y="865"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XSa7dnEeau1vMV3Bsx4w" x="732" y="459" width="75" height="29"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSbLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIR7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6XSbbdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7453,7 +7604,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XScLdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6XScbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XScrdnEeau1vMV3Bsx4w" x="3050" y="870"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6XScrdnEeau1vMV3Bsx4w" x="816" y="460" width="75" height="29"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6XSc7dnEeau1vMV3Bsx4w" type="2003" element="_l6ZISbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X4kLdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7462,7 +7613,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X4k7dnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X4lLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4lbdnEeau1vMV3Bsx4w" x="2755" y="865"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4lbdnEeau1vMV3Bsx4w" x="636" y="460" width="87" height="29"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X4lrdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIS7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X4l7dnEeau1vMV3Bsx4w" type="5007"/>
@@ -7471,7 +7622,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X4mrdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X4m7dnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4nLdnEeau1vMV3Bsx4w" x="2577" y="865"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4nLdnEeau1vMV3Bsx4w" x="528" y="460" width="99" height="29"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X4nbdnEeau1vMV3Bsx4w" type="2003" element="_l6ZITbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X4nrdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7480,7 +7631,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X4obdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X4ordnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4o7dnEeau1vMV3Bsx4w" x="2295" y="865"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4o7dnEeau1vMV3Bsx4w" x="264" y="460" height="29"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X4pLdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIT7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X4pbdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7489,7 +7640,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X4qLdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X4qbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4qrdnEeau1vMV3Bsx4w" x="2425" y="865"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4qrdnEeau1vMV3Bsx4w" x="396" y="460" height="29"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X4q7dnEeau1vMV3Bsx4w" type="2003" element="_l6ZtwbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X4rLdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7498,7 +7649,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X4r7dnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X4sLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4sbdnEeau1vMV3Bsx4w" x="310" y="250"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4sbdnEeau1vMV3Bsx4w" x="-60" y="363" height="15"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X4srdnEeau1vMV3Bsx4w" type="2003" element="_l6Ztw7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X4s7dnEeau1vMV3Bsx4w" type="5007"/>
@@ -7507,7 +7658,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X4trdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X4t7dnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4uLdnEeau1vMV3Bsx4w" x="180" y="385"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4uLdnEeau1vMV3Bsx4w" x="-156" y="460" width="75" height="27"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X4ubdnEeau1vMV3Bsx4w" type="2003" element="_l6ZtxbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X4urdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7516,7 +7667,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X4vbdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X4vrdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4v7dnEeau1vMV3Bsx4w" x="360" y="385"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4v7dnEeau1vMV3Bsx4w" x="-74" y="459" width="75" height="27"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X4wLdnEeau1vMV3Bsx4w" type="2003" element="_l6Ztx7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X4wbdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7525,7 +7676,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X4xLdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X4xbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4xrdnEeau1vMV3Bsx4w" x="540" y="385"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4xrdnEeau1vMV3Bsx4w" x="12" y="459" width="75" height="27"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X4x7dnEeau1vMV3Bsx4w" type="2003" element="_l6ZtybdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X4yLdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7534,7 +7685,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X4y7dnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X4zLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4zbdnEeau1vMV3Bsx4w" y="385"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X4zbdnEeau1vMV3Bsx4w" x="180" y="460" width="75" height="27"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X4zrdnEeau1vMV3Bsx4w" type="2003" element="_l6Zty7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X4z7dnEeau1vMV3Bsx4w" type="5007"/>
@@ -7543,7 +7694,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X40rdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X407dnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X41LdnEeau1vMV3Bsx4w" x="703" y="395"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X41LdnEeau1vMV3Bsx4w" x="96" y="459" width="75" height="27"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X43LdnEeau1vMV3Bsx4w" type="2003" element="_l6Ztz7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X43bdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7552,7 +7703,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X44LdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X44bdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X44rdnEeau1vMV3Bsx4w" x="2855"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X44rdnEeau1vMV3Bsx4w" x="1248" y="-156" height="16"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X5ELdnEeau1vMV3Bsx4w" type="2003" element="_l6ZvG7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5EbdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7561,7 +7712,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X5FLdnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X5FbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5FrdnEeau1vMV3Bsx4w" x="2645" y="20" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5FrdnEeau1vMV3Bsx4w" x="900" y="362" width="120" height="31"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_l6X5M7dnEeau1vMV3Bsx4w" type="2003" element="_l6ZvZbdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5NLdnEeau1vMV3Bsx4w" type="5007"/>
@@ -7570,7 +7721,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_l6X5N7dnEeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_l6X5OLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5ObdnEeau1vMV3Bsx4w" x="-930" y="97" width="192" height="49"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5ObdnEeau1vMV3Bsx4w" x="1044" y="363" width="192" height="49"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_YvbY4Ld1Eeau1vMV3Bsx4w" type="2003" element="_YtYxgLd1Eeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_Yvm_ELd1Eeau1vMV3Bsx4w" type="5007"/>
@@ -7579,7 +7730,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_YvoNMbd1Eeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_YvbY4bd1Eeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvbY4rd1Eeau1vMV3Bsx4w" x="1910" y="440" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YvbY4rd1Eeau1vMV3Bsx4w" x="1407" y="362" width="120" height="36"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_JfwFgLd8Eeau1vMV3Bsx4w" type="2003" element="_JfJBgLd8Eeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_JfwskLd8Eeau1vMV3Bsx4w" type="5007"/>
@@ -7588,7 +7739,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_Jfwsk7d8Eeau1vMV3Bsx4w"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_JfwFgbd8Eeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JfwFgrd8Eeau1vMV3Bsx4w" x="1845" y="585"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JfwFgrd8Eeau1vMV3Bsx4w" x="1968" y="532" height="27"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_Xh-bUHuWEeeCn_RNMwgEBg" type="2003" element="_XgmiUHuWEeeCn_RNMwgEBg">
           <children xmi:type="notation:Node" xmi:id="_Xh_CYHuWEeeCn_RNMwgEBg" type="5007"/>
@@ -7601,7 +7752,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_Xh_pcnuWEeeCn_RNMwgEBg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_Xh-bUXuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xh-bUnuWEeeCn_RNMwgEBg" x="1085" y="519" width="120" height="54"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xh-bUnuWEeeCn_RNMwgEBg" x="-792" y="460" width="120" height="54"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_PSQLAIKgEeeAppuRs-roLg" type="2003" element="_PQURUIKgEeeAppuRs-roLg">
           <children xmi:type="notation:Node" xmi:id="_PSZU8IKgEeeAppuRs-roLg" type="5007"/>
@@ -7610,7 +7761,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_PSZU84KgEeeAppuRs-roLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_PSQLAYKgEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSQLAoKgEeeAppuRs-roLg" x="2100" y="210" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSQLAoKgEeeAppuRs-roLg" x="1272" y="363" width="120" height="33"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_e1tR0IKgEeeAppuRs-roLg" type="2003" element="_e0z58IKgEeeAppuRs-roLg">
           <children xmi:type="notation:Node" xmi:id="_e1tR04KgEeeAppuRs-roLg" type="5007"/>
@@ -7623,7 +7774,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_e1tR1oKgEeeAppuRs-roLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_e1tR0YKgEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e1tR0oKgEeeAppuRs-roLg" x="2020" y="-110"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e1tR0oKgEeeAppuRs-roLg" x="1476" y="-72" height="53"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_hTMLdIKhEeeAppuRs-roLg" type="2003" element="_hSSzkIKhEeeAppuRs-roLg">
           <children xmi:type="notation:Node" xmi:id="_hTMLd4KhEeeAppuRs-roLg" type="5007"/>
@@ -7636,376 +7787,443 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_hTMLeoKhEeeAppuRs-roLg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_hTMLdYKhEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTMLdoKhEeeAppuRs-roLg" x="2251" y="46"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTMLdoKhEeeAppuRs-roLg" x="1236" y="528" height="50"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_JB2kcG6MEemSyfDlsGAqLA" type="2003" element="_JAggoG6MEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_JB3ykG6MEemSyfDlsGAqLA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_JB3ykW6MEemSyfDlsGAqLA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_JB3ykm6MEemSyfDlsGAqLA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_JB3yk26MEemSyfDlsGAqLA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_JB2kcW6MEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JB2kcm6MEemSyfDlsGAqLA" x="-240" y="459" width="75" height="27"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_rsImoG6WEemSyfDlsGAqLA" type="2003" element="_rrY_wG6WEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_rsImo26WEemSyfDlsGAqLA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_rsImpG6WEemSyfDlsGAqLA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_rsImpW6WEemSyfDlsGAqLA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_rsImpm6WEemSyfDlsGAqLA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_rsImoW6WEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rsImom6WEemSyfDlsGAqLA" x="2085" y="363" width="135" height="40"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_31nEcG6XEemSyfDlsGAqLA" type="2003" element="_309kMG6XEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_31nrgG6XEemSyfDlsGAqLA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_31nrgW6XEemSyfDlsGAqLA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_31nrgm6XEemSyfDlsGAqLA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_31nrg26XEemSyfDlsGAqLA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_31nEcW6XEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_31nEcm6XEemSyfDlsGAqLA" x="2196" y="564" width="60" height="41"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_53F0AG6XEemSyfDlsGAqLA" type="2003" element="_52k2oG6XEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_53F0A26XEemSyfDlsGAqLA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_53F0BG6XEemSyfDlsGAqLA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_53F0BW6XEemSyfDlsGAqLA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_53F0Bm6XEemSyfDlsGAqLA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_53F0AW6XEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_53F0Am6XEemSyfDlsGAqLA" x="2115" y="466" width="75" height="28"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_8nYKUG6XEemSyfDlsGAqLA" type="2003" element="_8mxtYG6XEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_8nYxYG6XEemSyfDlsGAqLA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_8nYxYW6XEemSyfDlsGAqLA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_8nYxYm6XEemSyfDlsGAqLA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_8nYxY26XEemSyfDlsGAqLA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_8nYKUW6XEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8nYKUm6XEemSyfDlsGAqLA" x="2268" y="564" width="63" height="16"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_-vo3UG6XEemSyfDlsGAqLA" type="2003" element="_-vAlMG6XEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_-vpeYG6XEemSyfDlsGAqLA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_-vpeYW6XEemSyfDlsGAqLA" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_-vpeYm6XEemSyfDlsGAqLA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_-vpeY26XEemSyfDlsGAqLA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_-vo3UW6XEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-vo3Um6XEemSyfDlsGAqLA" x="2340" y="564" width="60" height="16"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_9KcB0G6cEemSyfDlsGAqLA" type="2003" element="_9J4BIG6cEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_9KcB026cEemSyfDlsGAqLA" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_9KcB1G6cEemSyfDlsGAqLA" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_ZW-wEG6dEemSyfDlsGAqLA" type="3010" element="_ZWWd8G6dEemSyfDlsGAqLA">
+              <styles xmi:type="notation:FontStyle" xmi:id="_ZW-wEW6dEemSyfDlsGAqLA" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_ZW-wEm6dEemSyfDlsGAqLA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_9KcB1W6cEemSyfDlsGAqLA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_9KcB1m6cEemSyfDlsGAqLA"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_9KcB0W6cEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9KcB0m6cEemSyfDlsGAqLA" x="2196" y="466" width="183" height="53"/>
         </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_l6X5OrdnEeau1vMV3Bsx4w"/>
         <edges xmi:type="notation:Edge" xmi:id="_l6X5a7dnEeau1vMV3Bsx4w" type="4001" element="_l6Zt6bdnEeau1vMV3Bsx4w" source="_l6XR7LdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5bLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5bbdnEeau1vMV3Bsx4w" x="-265" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5bbdnEeau1vMV3Bsx4w" x="-86" y="-42"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5brdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5b7dnEeau1vMV3Bsx4w" x="-49" y="95"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5b7dnEeau1vMV3Bsx4w" x="-87" y="36"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5cLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5cbdnEeau1vMV3Bsx4w" x="-47" y="214"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5cbdnEeau1vMV3Bsx4w" x="4" y="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X5crdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X5c7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5dLdnEeau1vMV3Bsx4w" points="[0, 98, 615, 152]$[0, 128, 615, 182]$[-615, 128, 0, 182]$[-615, -54, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5dLdnEeau1vMV3Bsx4w" points="[0, 0, 456, 324]$[0, -182, 456, 142]$[-397, -182, 59, 142]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5dbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5drdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5drdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X5g7dnEeau1vMV3Bsx4w" type="4001" element="_l6Zt8bdnEeau1vMV3Bsx4w" source="_l6XSH7dnEeau1vMV3Bsx4w" target="_l6XSGLdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5hLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5hbdnEeau1vMV3Bsx4w" x="8" y="-58"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5hbdnEeau1vMV3Bsx4w" x="-46" y="-27"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5hrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5h7dnEeau1vMV3Bsx4w" x="27" y="8"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5h7dnEeau1vMV3Bsx4w" x="66" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5iLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5ibdnEeau1vMV3Bsx4w" x="-62" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5ibdnEeau1vMV3Bsx4w" x="-39" y="73"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X5irdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X5i7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5jLdnEeau1vMV3Bsx4w" points="[60, 38, -250, -225]$[63, 225, -247, -38]$[251, 225, -59, -38]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5jLdnEeau1vMV3Bsx4w" points="[60, 19, -108, -114]$[157, 19, -11, -114]$[157, 94, -11, -39]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5jbdnEeau1vMV3Bsx4w" id="(0.49586776859504134,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5jrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X5j7dnEeau1vMV3Bsx4w" type="4001" element="_l6Zt9bdnEeau1vMV3Bsx4w" source="_l6XSH7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5kLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5kbdnEeau1vMV3Bsx4w" x="-50" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5kbdnEeau1vMV3Bsx4w" x="88" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5krdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5k7dnEeau1vMV3Bsx4w" x="32" y="2"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5k7dnEeau1vMV3Bsx4w" x="7" y="2"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5lLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5lbdnEeau1vMV3Bsx4w" x="-19" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5lbdnEeau1vMV3Bsx4w" x="-255" y="22"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X5lrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X5l7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5mLdnEeau1vMV3Bsx4w" points="[0, 0, -180, 119]$[0, -87, -180, 32]$[180, -87, 0, 32]$[180, -119, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5mLdnEeau1vMV3Bsx4w" points="[0, 0, 708, 324]$[0, -194, 708, 130]$[-649, -194, 59, 130]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5mbdnEeau1vMV3Bsx4w" id="(0.49586776859504134,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5mrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5mrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X5m7dnEeau1vMV3Bsx4w" type="4001" element="_l6Zt-bdnEeau1vMV3Bsx4w" source="_l6XSO7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5nLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5nbdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5nbdnEeau1vMV3Bsx4w" x="-651" y="434"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5nrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5n7dnEeau1vMV3Bsx4w" x="-215" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5n7dnEeau1vMV3Bsx4w" x="-234" y="-79"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5oLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5obdnEeau1vMV3Bsx4w" x="-25" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5obdnEeau1vMV3Bsx4w" x="187" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X5ordnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X5o7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5pLdnEeau1vMV3Bsx4w" points="[0, 0, -722, 220]$[0, -160, -722, 60]$[722, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5pbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5prdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5pLdnEeau1vMV3Bsx4w" points="[-34, 0, -1775, 422]$[-34, -508, -1775, -86]$[1682, -508, -59, -86]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5pbdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5prdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X5p7dnEeau1vMV3Bsx4w" type="4001" element="_l6Zt_bdnEeau1vMV3Bsx4w" source="_l6XSQrdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5qLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5qbdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5qbdnEeau1vMV3Bsx4w" x="-610" y="422"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5qrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5q7dnEeau1vMV3Bsx4w" x="-72" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5q7dnEeau1vMV3Bsx4w" x="164" y="182"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5rLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5rbdnEeau1vMV3Bsx4w" x="356" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5rbdnEeau1vMV3Bsx4w" x="42" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X5rrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X5r7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5sLdnEeau1vMV3Bsx4w" points="[0, 0, -542, 220]$[1, -160, -541, 60]$[542, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5sbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5srdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5sLdnEeau1vMV3Bsx4w" points="[-46, 0, -1703, 421]$[-46, -495, -1703, -74]$[1598, -495, -59, -74]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5sbdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5srdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X5s7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuAbdnEeau1vMV3Bsx4w" source="_l6XSSbdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5tLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5tbdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5tbdnEeau1vMV3Bsx4w" x="-572" y="248"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5trdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5t7dnEeau1vMV3Bsx4w" x="-206" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5t7dnEeau1vMV3Bsx4w" x="-303" y="8"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5uLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5ubdnEeau1vMV3Bsx4w" x="-31" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5ubdnEeau1vMV3Bsx4w" x="214" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X5urdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X5u7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5vLdnEeau1vMV3Bsx4w" points="[0, 0, -181, 220]$[180, -61, -1, 159]$[181, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5vbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5vrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5vLdnEeau1vMV3Bsx4w" points="[-10, 0, -1583, 421]$[-10, -483, -1583, -62]$[1514, -483, -59, -62]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5vbdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5vrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X5v7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuBbdnEeau1vMV3Bsx4w" source="_l6XSSbdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5wLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5wbdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5wbdnEeau1vMV3Bsx4w" x="-575" y="256"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5wrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5w7dnEeau1vMV3Bsx4w" x="19" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5w7dnEeau1vMV3Bsx4w" x="61"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5xLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5xbdnEeau1vMV3Bsx4w" x="-28" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5xbdnEeau1vMV3Bsx4w" x="109" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X5xrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X5x7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5yLdnEeau1vMV3Bsx4w" points="[0, 0, -181, 220]$[1, -160, -180, 60]$[181, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5ybdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5yrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5yLdnEeau1vMV3Bsx4w" points="[14, 0, -1559, 421]$[14, -469, -1559, -48]$[1514, -469, -59, -48]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5ybdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5yrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X5y7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuCbdnEeau1vMV3Bsx4w" source="_l6XSULdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5zLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5zbdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5zbdnEeau1vMV3Bsx4w" x="-522" y="382"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5zrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5z7dnEeau1vMV3Bsx4w" x="8" y="120"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5z7dnEeau1vMV3Bsx4w" x="54"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X50LdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X50bdnEeau1vMV3Bsx4w" x="382" y="-20"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X50bdnEeau1vMV3Bsx4w" x="37" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X50rdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X507dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X51LdnEeau1vMV3Bsx4w" points="[0, 0, 181, 220]$[-1, -160, 180, 60]$[-181, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X51bdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X51rdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X51LdnEeau1vMV3Bsx4w" points="[-21, 0, -1510, 421]$[-21, -459, -1510, -38]$[1430, -459, -59, -38]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X51bdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X51rdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X517dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuDbdnEeau1vMV3Bsx4w" source="_l6XSV7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X52LdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X52bdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X52bdnEeau1vMV3Bsx4w" x="-524" y="355"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X52rdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X527dnEeau1vMV3Bsx4w" x="-18" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X527dnEeau1vMV3Bsx4w" x="81"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X53LdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X53bdnEeau1vMV3Bsx4w" x="276" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X53bdnEeau1vMV3Bsx4w" x="43" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X53rdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X537dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X54LdnEeau1vMV3Bsx4w" points="[0, 0, 362, 220]$[-1, -160, 361, 60]$[-362, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X54bdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X54rdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X54LdnEeau1vMV3Bsx4w" points="[-43, 0, -1451, 421]$[-43, -447, -1451, -26]$[1349, -447, -59, -26]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X54bdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X54rdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X547dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuEbdnEeau1vMV3Bsx4w" source="_l6XSV7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X55LdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X55bdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X55bdnEeau1vMV3Bsx4w" x="-502" y="330"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X55rdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X557dnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X557dnEeau1vMV3Bsx4w" x="158" y="251"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X56LdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X56bdnEeau1vMV3Bsx4w" x="454" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X56bdnEeau1vMV3Bsx4w" x="28" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X56rdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X567dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X57LdnEeau1vMV3Bsx4w" points="[0, 0, 362, 220]$[180, -61, 542, 159]$[180, -160, 542, 60]$[-362, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X57bdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X57rdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X57LdnEeau1vMV3Bsx4w" points="[5, 0, -1403, 421]$[5, -435, -1403, -14]$[1349, -435, -59, -14]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X57bdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X57rdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X577dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuFbdnEeau1vMV3Bsx4w" source="_l6XSZbdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X58LdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X58bdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X58bdnEeau1vMV3Bsx4w" x="28" y="150"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X58rdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X587dnEeau1vMV3Bsx4w" x="401" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X587dnEeau1vMV3Bsx4w" x="180" y="304"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X59LdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X59bdnEeau1vMV3Bsx4w" x="84" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X59bdnEeau1vMV3Bsx4w" x="37" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X59rdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X597dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5-LdnEeau1vMV3Bsx4w" points="[0, 0, 1447, 220]$[-1, -160, 1446, 60]$[-1447, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5-bdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5-rdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X5-LdnEeau1vMV3Bsx4w" points="[-47, 103, -395, 421]$[-47, -200, -395, 118]$[289, -200, -59, 118]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5-bdnEeau1vMV3Bsx4w" id="(0.8082191780821918,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X5-rdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X5-7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuGbdnEeau1vMV3Bsx4w" source="_l6XSZbdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X5_LdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5_bdnEeau1vMV3Bsx4w" x="-287" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5_bdnEeau1vMV3Bsx4w" x="20" y="174"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X5_rdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5_7dnEeau1vMV3Bsx4w" x="-217" y="-13"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X5_7dnEeau1vMV3Bsx4w" x="300" y="263"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6ALdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6AbdnEeau1vMV3Bsx4w" x="-24" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6AbdnEeau1vMV3Bsx4w" x="23" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6ArdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X6A7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6BLdnEeau1vMV3Bsx4w" points="[0, 0, 1275, 709]$[0, -217, 1275, 492]$[8, -217, 1283, 492]$[8, -487, 1283, 222]$[-1275, -487, 0, 222]$[-1275, -709, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6BbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6BrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6BLdnEeau1vMV3Bsx4w" points="[-11, 103, -359, 421]$[-11, -188, -359, 130]$[289, -188, -59, 130]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6BbdnEeau1vMV3Bsx4w" id="(0.8082191780821918,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6BrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X6B7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuHbdnEeau1vMV3Bsx4w" source="_l6XSbLdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X6CLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6CbdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6CbdnEeau1vMV3Bsx4w" x="-226" y="49"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6CrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6C7dnEeau1vMV3Bsx4w" x="357" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6C7dnEeau1vMV3Bsx4w" x="171" y="220"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6DLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6DbdnEeau1vMV3Bsx4w" x="133" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6DbdnEeau1vMV3Bsx4w" x="50" y="145"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6DrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X6D7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6ELdnEeau1vMV3Bsx4w" points="[0, 0, 724, 220]$[-1, -160, 723, 60]$[-724, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6EbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6ErdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6ELdnEeau1vMV3Bsx4w" points="[-11, 103, -275, 422]$[-11, -177, -275, 142]$[205, -177, -59, 142]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6EbdnEeau1vMV3Bsx4w" id="(0.8082191780821918,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6ErdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X6E7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuIbdnEeau1vMV3Bsx4w" source="_l6XSc7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X6FLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6FbdnEeau1vMV3Bsx4w" x="-137" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6FbdnEeau1vMV3Bsx4w" x="-61" y="198"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6FrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6F7dnEeau1vMV3Bsx4w" x="-802" y="232"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6F7dnEeau1vMV3Bsx4w" x="68" y="384"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6GLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6GbdnEeau1vMV3Bsx4w" x="-20" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6GbdnEeau1vMV3Bsx4w" x="63" y="20"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6GrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X6G7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6HLdnEeau1vMV3Bsx4w" points="[0, 0, 1125, 709]$[0, -487, 1125, 222]$[-1125, -487, 0, 222]$[-1125, -709, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6HbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6HrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6HLdnEeau1vMV3Bsx4w" points="[-11, 103, -455, 422]$[-11, -225, -455, 94]$[385, -225, -59, 94]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6HbdnEeau1vMV3Bsx4w" id="(0.6941176470588235,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6HrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X6H7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuJbdnEeau1vMV3Bsx4w" source="_l6XSc7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X6ILdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6IbdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6IbdnEeau1vMV3Bsx4w" x="-51" y="152"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6IrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6I7dnEeau1vMV3Bsx4w" x="444" y="-486"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6I7dnEeau1vMV3Bsx4w" x="195" y="277"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6JLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6JbdnEeau1vMV3Bsx4w" x="7" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6JbdnEeau1vMV3Bsx4w" x="73" y="15"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6JrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X6J7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6KLdnEeau1vMV3Bsx4w" points="[0, 0, 2171, 220]$[-1, -160, 2170, 60]$[-2171, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6KbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6KrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6KLdnEeau1vMV3Bsx4w" points="[13, 103, -431, 422]$[13, -213, -431, 106]$[385, -213, -59, 106]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6KbdnEeau1vMV3Bsx4w" id="(0.6941176470588235,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6KrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X6K7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuKbdnEeau1vMV3Bsx4w" source="_l6X4lrdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X6LLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6LbdnEeau1vMV3Bsx4w" x="-109" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6LbdnEeau1vMV3Bsx4w" x="-115" y="234"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6LrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6L7dnEeau1vMV3Bsx4w" x="-725" y="236"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6L7dnEeau1vMV3Bsx4w" x="71"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6MLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6MbdnEeau1vMV3Bsx4w" x="-1" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6MbdnEeau1vMV3Bsx4w" x="26" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6MrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X6M7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6NLdnEeau1vMV3Bsx4w" points="[0, 0, 947, 709]$[0, -225, 947, 484]$[-4, -225, 943, 484]$[-4, -487, 943, 222]$[-947, -487, 0, 222]$[-947, -709, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6NbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6NrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6NLdnEeau1vMV3Bsx4w" points="[-35, 103, -587, 422]$[-35, -249, -587, 70]$[493, -249, -59, 70]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6NbdnEeau1vMV3Bsx4w" id="(0.6082474226804123,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6NrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X6N7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuLbdnEeau1vMV3Bsx4w" source="_l6X4lrdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X6OLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6ObdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6ObdnEeau1vMV3Bsx4w" x="-45" y="126"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6OrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6O7dnEeau1vMV3Bsx4w" x="471" y="-476"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6O7dnEeau1vMV3Bsx4w" x="187" y="392"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6PLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6PbdnEeau1vMV3Bsx4w" x="7" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6PbdnEeau1vMV3Bsx4w" x="116" y="-4"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6PrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X6P7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6QLdnEeau1vMV3Bsx4w" points="[0, 0, 1809, 220]$[-1, -160, 1808, 60]$[-1809, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6QbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6QrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6QLdnEeau1vMV3Bsx4w" points="[-11, 103, -563, 422]$[-11, -237, -563, 82]$[493, -237, -59, 82]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6QbdnEeau1vMV3Bsx4w" id="(0.6082474226804123,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6QrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X6Q7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuMbdnEeau1vMV3Bsx4w" source="_l6X4nbdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X6RLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6RbdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6RbdnEeau1vMV3Bsx4w" x="-247" y="345"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6RrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6R7dnEeau1vMV3Bsx4w" x="379" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6R7dnEeau1vMV3Bsx4w" x="-58" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6SLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6SbdnEeau1vMV3Bsx4w" x="72" y="25"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6SbdnEeau1vMV3Bsx4w" x="27" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6SrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X6S7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6TLdnEeau1vMV3Bsx4w" points="[0, 0, -903, 220]$[0, -160, -903, 60]$[903, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6TbdnEeau1vMV3Bsx4w" id="(0.49166666666666664,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6TrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6TLdnEeau1vMV3Bsx4w" points="[-34, 103, -851, 422]$[-34, -297, -851, 22]$[758, -297, -59, 22]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6TbdnEeau1vMV3Bsx4w" id="(0.49166666666666664,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6TrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X6T7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuNbdnEeau1vMV3Bsx4w" source="_l6X4nbdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X6ULdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6UbdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6UbdnEeau1vMV3Bsx4w" x="-135" y="270"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6UrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6U7dnEeau1vMV3Bsx4w" x="-55"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6U7dnEeau1vMV3Bsx4w" x="66"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6VLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6VbdnEeau1vMV3Bsx4w" x="18" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6VbdnEeau1vMV3Bsx4w" x="23" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6VrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X6V7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6WLdnEeau1vMV3Bsx4w" points="[0, 0, -902, 220]$[-182, -61, -1084, 159]$[-182, -160, -1084, 60]$[902, -220, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6WbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6WrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6WLdnEeau1vMV3Bsx4w" points="[-23, 103, -839, 422]$[-23, -285, -839, 34]$[757, -285, -59, 34]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6WbdnEeau1vMV3Bsx4w" id="(0.5,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6WrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X6W7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuObdnEeau1vMV3Bsx4w" source="_l6X4pLdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X6XLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6XbdnEeau1vMV3Bsx4w" x="10" y="-307"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6XbdnEeau1vMV3Bsx4w" x="-175" y="321"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6XrdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6X7dnEeau1vMV3Bsx4w" x="154" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6X7dnEeau1vMV3Bsx4w" x="-11" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6YLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6YbdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6YbdnEeau1vMV3Bsx4w" x="-29" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6YrdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X6Y7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6ZLdnEeau1vMV3Bsx4w" points="[-40, 0, 755, 709]$[-40, -737, 755, -28]$[-736, -737, 59, -28]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6ZbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6ZrdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6ZLdnEeau1vMV3Bsx4w" points="[-23, 103, -707, 422]$[-23, -273, -707, 46]$[625, -273, -59, 46]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6ZbdnEeau1vMV3Bsx4w" id="(0.5,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6ZrdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X6Z7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuPbdnEeau1vMV3Bsx4w" source="_l6X4pLdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X6aLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6abdnEeau1vMV3Bsx4w" x="172" y="-6"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6abdnEeau1vMV3Bsx4w" x="-105" y="309"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6ardnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6a7dnEeau1vMV3Bsx4w" x="-188" y="-851"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6a7dnEeau1vMV3Bsx4w" x="71"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6bLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6bbdnEeau1vMV3Bsx4w" x="-266" y="1"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6bbdnEeau1vMV3Bsx4w" x="26" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6brdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6X6b7dnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6cLdnEeau1vMV3Bsx4w" points="[0, 0, 795, 709]$[0, -213, 795, 496]$[-740, -213, 55, 496]$[-740, -217, 55, 492]$[-795, -217, 0, 492]$[-795, -709, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6cbdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6crdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6X6cLdnEeau1vMV3Bsx4w" points="[25, 103, -659, 422]$[25, -261, -659, 58]$[625, -261, -59, 58]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6cbdnEeau1vMV3Bsx4w" id="(0.5,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6X6crdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6X6c7dnEeau1vMV3Bsx4w" type="4001" element="_l6ZuQbdnEeau1vMV3Bsx4w" source="_l6X4q7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6X6dLdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6dbdnEeau1vMV3Bsx4w" x="-6" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6dbdnEeau1vMV3Bsx4w" x="-445" y="306"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6drdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6d7dnEeau1vMV3Bsx4w" x="347" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6d7dnEeau1vMV3Bsx4w" x="100" y="1011"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6X6eLdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6ebdnEeau1vMV3Bsx4w" x="61" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6X6ebdnEeau1vMV3Bsx4w" x="77" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6X6erdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YfoLdnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YfobdnEeau1vMV3Bsx4w" points="[59, 1, -1261, 95]$[1261, 1, -59, 95]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YfordnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yfo7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YfobdnEeau1vMV3Bsx4w" points="[-81, -9, -1177, 325]$[-81, -336, -1177, -2]$[1037, -336, -59, -2]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YfordnEeau1vMV3Bsx4w" id="(0.875,0.24390243902439024)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yfo7dnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YfpLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuRbdnEeau1vMV3Bsx4w" source="_l6X4q7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YfpbdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfprdnEeau1vMV3Bsx4w" x="64" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfprdnEeau1vMV3Bsx4w" x="-301" y="294"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6Yfp7dnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfqLdnEeau1vMV3Bsx4w" x="436" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfqLdnEeau1vMV3Bsx4w" x="103" y="925"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6YfqbdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfqrdnEeau1vMV3Bsx4w" x="111" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfqrdnEeau1vMV3Bsx4w" x="50" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yfq7dnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YfrLdnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YfrbdnEeau1vMV3Bsx4w" points="[1, 0, -1319, 94]$[1, -40, -1319, 54]$[1320, -40, 0, 54]$[1320, -94, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YfrbdnEeau1vMV3Bsx4w" points="[49, 0, -1091, 325]$[49, -315, -1091, 10]$[1081, -315, -59, 10]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YfrrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yfr7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yfr7dnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YgTLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZufbdnEeau1vMV3Bsx4w" source="_l6XR27dnEeau1vMV3Bsx4w" target="_l6X43LdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YgTbdnEeau1vMV3Bsx4w" type="6001">
@@ -8020,7 +8238,7 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6YgU7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YgVLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YgVbdnEeau1vMV3Bsx4w" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgVrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgVrdnEeau1vMV3Bsx4w" id="(0.5,0.03833865814696486)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgV7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YgZLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuhbdnEeau1vMV3Bsx4w" source="_l6XR7LdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
@@ -8035,9 +8253,9 @@
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yga7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YgbLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YgbbdnEeau1vMV3Bsx4w" points="[0, 0, -1806, 60]$[1806, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgbrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygb7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YgbbdnEeau1vMV3Bsx4w" points="[0, 0, 444, 325]$[0, -99, 444, 226]$[-443, -99, 1, 226]$[-443, -122, 1, 203]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgbrdnEeau1vMV3Bsx4w" id="(0.075,0.2682926829268293)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygb7dnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YgcLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuibdnEeau1vMV3Bsx4w" source="_l6XR87dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YgcbdnEeau1vMV3Bsx4w" type="6001">
@@ -8053,7 +8271,7 @@
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YgeLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YgebdnEeau1vMV3Bsx4w" points="[0, 0, -1446, 60]$[1446, -60, 0, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgerdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yge7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yge7dnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YgfLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZujbdnEeau1vMV3Bsx4w" source="_l6XR-rdnEeau1vMV3Bsx4w" target="_l6XR87dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YgfbdnEeau1vMV3Bsx4w" type="6001">
@@ -8069,7 +8287,7 @@
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YghLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YghbdnEeau1vMV3Bsx4w" points="[0, 0, 4, 60]$[-4, -60, 0, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YghrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygh7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygh7dnEeau1vMV3Bsx4w" id="(0.5,32.666666666666664)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YgiLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZukbdnEeau1vMV3Bsx4w" source="_l6XSBLdnEeau1vMV3Bsx4w" target="_l6XR87dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YgibdnEeau1vMV3Bsx4w" type="6001">
@@ -8085,7 +8303,7 @@
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YgkLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YgkbdnEeau1vMV3Bsx4w" points="[0, 0, -383, 60]$[383, -60, 0, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgkrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygk7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygk7dnEeau1vMV3Bsx4w" id="(0.5,32.666666666666664)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YglLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZulbdnEeau1vMV3Bsx4w" source="_l6XSDrdnEeau1vMV3Bsx4w" target="_l6XR87dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YglbdnEeau1vMV3Bsx4w" type="6001">
@@ -8101,7 +8319,7 @@
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YgnLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YgnbdnEeau1vMV3Bsx4w" points="[0, 0, -181, 60]$[181, -60, 0, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgnrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygn7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygn7dnEeau1vMV3Bsx4w" id="(0.5,32.666666666666664)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YgrLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZunbdnEeau1vMV3Bsx4w" source="_l6XSH7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YgrbdnEeau1vMV3Bsx4w" type="6001">
@@ -8115,9 +8333,9 @@
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Ygs7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YgtLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YgtbdnEeau1vMV3Bsx4w" points="[0, 0, -1266, 60]$[1266, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgtrdnEeau1vMV3Bsx4w" id="(0.49586776859504134,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygt7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YgtbdnEeau1vMV3Bsx4w" points="[0, 0, 708, 324]$[0, -98, 708, 226]$[-707, -98, 1, 226]$[-707, -121, 1, 203]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgtrdnEeau1vMV3Bsx4w" id="(0.1487603305785124,0.12195121951219512)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygt7dnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YguLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuobdnEeau1vMV3Bsx4w" source="_l6XSJrdnEeau1vMV3Bsx4w" target="_l6XSH7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YgubdnEeau1vMV3Bsx4w" type="6001">
@@ -8132,8 +8350,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Ygv7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YgwLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YgwbdnEeau1vMV3Bsx4w" points="[0, 0, 4, 60]$[-4, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgwrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygw7dnEeau1vMV3Bsx4w" id="(0.49586776859504134,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgwrdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygw7dnEeau1vMV3Bsx4w" id="(0.49586776859504134,2.9696969696969697)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YgxLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZupbdnEeau1vMV3Bsx4w" source="_l6XSLbdnEeau1vMV3Bsx4w" target="_l6XSH7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YgxbdnEeau1vMV3Bsx4w" type="6001">
@@ -8148,8 +8366,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Ygy7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YgzLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YgzbdnEeau1vMV3Bsx4w" points="[0, 0, 184, 60]$[-184, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgzrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygz7dnEeau1vMV3Bsx4w" id="(0.49586776859504134,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YgzrdnEeau1vMV3Bsx4w" id="(0.25316455696202533,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Ygz7dnEeau1vMV3Bsx4w" id="(0.49586776859504134,2.9696969696969697)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6Yg0LdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuqbdnEeau1vMV3Bsx4w" source="_l6XSNLdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6Yg0bdnEeau1vMV3Bsx4w" type="6001">
@@ -8164,8 +8382,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yg17dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6Yg2LdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6Yg2bdnEeau1vMV3Bsx4w" points="[0, 0, -361, 60]$[361, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg2rdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg27dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg2rdnEeau1vMV3Bsx4w" id="(0.6020408163265306,-1.2272727272727273)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg27dnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6Yg3LdnEeau1vMV3Bsx4w" type="4001" element="_l6ZurbdnEeau1vMV3Bsx4w" source="_l6XSO7dnEeau1vMV3Bsx4w" target="_l6XSNLdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6Yg3bdnEeau1vMV3Bsx4w" type="6001">
@@ -8180,8 +8398,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yg47dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6Yg5LdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6Yg5bdnEeau1vMV3Bsx4w" points="[0, 0, -361, 60]$[361, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg5rdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg57dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg5rdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg57dnEeau1vMV3Bsx4w" id="(0.6020408163265306,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6Yg6LdnEeau1vMV3Bsx4w" type="4001" element="_l6ZusbdnEeau1vMV3Bsx4w" source="_l6XSQrdnEeau1vMV3Bsx4w" target="_l6XSNLdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6Yg6bdnEeau1vMV3Bsx4w" type="6001">
@@ -8196,8 +8414,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yg77dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6Yg8LdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6Yg8bdnEeau1vMV3Bsx4w" points="[0, 0, -181, 60]$[181, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg8rdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg87dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg8rdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg87dnEeau1vMV3Bsx4w" id="(0.6020408163265306,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6Yg9LdnEeau1vMV3Bsx4w" type="4001" element="_l6ZutbdnEeau1vMV3Bsx4w" source="_l6XSSbdnEeau1vMV3Bsx4w" target="_l6XSNLdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6Yg9bdnEeau1vMV3Bsx4w" type="6001">
@@ -8212,8 +8430,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yg-7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6Yg_LdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6Yg_bdnEeau1vMV3Bsx4w" points="[0, 0, 180, 60]$[-180, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg_rdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg_7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg_rdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yg_7dnEeau1vMV3Bsx4w" id="(0.6020408163265306,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhALdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuubdnEeau1vMV3Bsx4w" source="_l6XSULdnEeau1vMV3Bsx4w" target="_l6XSNLdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhAbdnEeau1vMV3Bsx4w" type="6001">
@@ -8228,24 +8446,24 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6YhB7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhCLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhCbdnEeau1vMV3Bsx4w" points="[0, 0, 542, 60]$[-542, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhCrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhC7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhCrdnEeau1vMV3Bsx4w" id="(0.7662337662337663,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhC7dnEeau1vMV3Bsx4w" id="(0.6020408163265306,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhDLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuvbdnEeau1vMV3Bsx4w" source="_l6XSV7dnEeau1vMV3Bsx4w" target="_l6XSNLdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhDbdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhDrdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhDrdnEeau1vMV3Bsx4w" x="-2" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6YhD7dnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhELdnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhELdnEeau1vMV3Bsx4w" x="-2" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6YhEbdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhErdnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhErdnEeau1vMV3Bsx4w" x="-2" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6YhE7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhFLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhFbdnEeau1vMV3Bsx4w" points="[0, 0, 723, 60]$[-723, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhFrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhF7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhFbdnEeau1vMV3Bsx4w" points="[0, 0, 224, 55]$[0, -35, 224, 20]$[-233, -35, -9, 20]$[-233, -55, -9, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhFrdnEeau1vMV3Bsx4w" id="(0.5569620253164557,0.13636363636363635)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhF7dnEeau1vMV3Bsx4w" id="(0.6020408163265306,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhGLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuwbdnEeau1vMV3Bsx4w" source="_l6XSXrdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhGbdnEeau1vMV3Bsx4w" type="6001">
@@ -8260,8 +8478,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6YhH7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhILdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhIbdnEeau1vMV3Bsx4w" points="[0, 0, 1267, 60]$[-1267, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhIrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhI7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhIrdnEeau1vMV3Bsx4w" id="(0.5412844036697247,-1.2790697674418605)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhI7dnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhJLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuxbdnEeau1vMV3Bsx4w" source="_l6XSZbdnEeau1vMV3Bsx4w" target="_l6XSXrdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhJbdnEeau1vMV3Bsx4w" type="6001">
@@ -8276,24 +8494,24 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6YhK7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhLLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhLbdnEeau1vMV3Bsx4w" points="[0, 0, 180, 60]$[-180, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhLrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhL7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhLrdnEeau1vMV3Bsx4w" id="(0.8082191780821918,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhL7dnEeau1vMV3Bsx4w" id="(0.5412844036697247,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhMLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuybdnEeau1vMV3Bsx4w" source="_l6XSbLdnEeau1vMV3Bsx4w" target="_l6XSXrdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhMbdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhMrdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhMrdnEeau1vMV3Bsx4w" x="1" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6YhM7dnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhNLdnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhNLdnEeau1vMV3Bsx4w" x="1" y="9"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6YhNbdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhNrdnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhNrdnEeau1vMV3Bsx4w" x="1" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6YhN7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhOLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhObdnEeau1vMV3Bsx4w" points="[0, 0, -543, 60]$[543, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhOrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhO7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhObdnEeau1vMV3Bsx4w" points="[0, 103, 216, 57]$[0, 63, 216, 17]$[-215, 63, 1, 17]$[-215, 46, 1, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhOrdnEeau1vMV3Bsx4w" id="(0.26666666666666666,0.07317073170731707)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhO7dnEeau1vMV3Bsx4w" id="(0.5412844036697247,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhPLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuzbdnEeau1vMV3Bsx4w" source="_l6XSc7dnEeau1vMV3Bsx4w" target="_l6XSXrdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhPbdnEeau1vMV3Bsx4w" type="6001">
@@ -8308,8 +8526,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6YhQ7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhRLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhRbdnEeau1vMV3Bsx4w" points="[0, 0, 904, 60]$[-904, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhRrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhR7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhRrdnEeau1vMV3Bsx4w" id="(0.6941176470588235,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhR7dnEeau1vMV3Bsx4w" id="(0.5412844036697247,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhSLdnEeau1vMV3Bsx4w" type="4001" element="_l6Zu0bdnEeau1vMV3Bsx4w" source="_l6X4lrdnEeau1vMV3Bsx4w" target="_l6XSXrdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhSbdnEeau1vMV3Bsx4w" type="6001">
@@ -8324,8 +8542,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6YhT7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhULdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhUbdnEeau1vMV3Bsx4w" points="[0, 0, 542, 60]$[-542, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhUrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhU7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhUrdnEeau1vMV3Bsx4w" id="(0.6082474226804123,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhU7dnEeau1vMV3Bsx4w" id="(0.5412844036697247,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhVLdnEeau1vMV3Bsx4w" type="4001" element="_l6Zu1bdnEeau1vMV3Bsx4w" source="_l6X4nbdnEeau1vMV3Bsx4w" target="_l6XSXrdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhVbdnEeau1vMV3Bsx4w" type="6001">
@@ -8340,8 +8558,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6YhW7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhXLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhXbdnEeau1vMV3Bsx4w" points="[0, 0, -2169, 60]$[2169, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhXrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhX7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhXrdnEeau1vMV3Bsx4w" id="(0.5,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhX7dnEeau1vMV3Bsx4w" id="(0.5412844036697247,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhYLdnEeau1vMV3Bsx4w" type="4001" element="_l6Zu2bdnEeau1vMV3Bsx4w" source="_l6X4pLdnEeau1vMV3Bsx4w" target="_l6XSXrdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhYbdnEeau1vMV3Bsx4w" type="6001">
@@ -8356,24 +8574,24 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6YhZ7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhaLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhabdnEeau1vMV3Bsx4w" points="[0, 0, -181, 60]$[181, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhardnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yha7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhardnEeau1vMV3Bsx4w" id="(0.5,-2.6296296296296298)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yha7dnEeau1vMV3Bsx4w" id="(0.5412844036697247,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhbLdnEeau1vMV3Bsx4w" type="4001" element="_l6Zu3bdnEeau1vMV3Bsx4w" source="_l6X4q7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhbbdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhbrdnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhbrdnEeau1vMV3Bsx4w" x="-5" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6Yhb7dnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhcLdnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhcLdnEeau1vMV3Bsx4w" x="-5" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6YhcbdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhcrdnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YhcrdnEeau1vMV3Bsx4w" x="-6" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yhc7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhdLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhdbdnEeau1vMV3Bsx4w" points="[0, 0, -1626, 60]$[1626, -60, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhdbdnEeau1vMV3Bsx4w" points="[0, 0, -1140, 325]$[0, -99, -1140, 226]$[1141, -99, 1, 226]$[1141, -122, 1, 203]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhdrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yhd7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yhd7dnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YheLdnEeau1vMV3Bsx4w" type="4001" element="_l6Zu4bdnEeau1vMV3Bsx4w" source="_l6X4srdnEeau1vMV3Bsx4w" target="_l6X4q7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhebdnEeau1vMV3Bsx4w" type="6001">
@@ -8388,8 +8606,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yhf7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhgLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhgbdnEeau1vMV3Bsx4w" points="[0, 0, -940, 60]$[940, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhgrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yhg7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhgrdnEeau1vMV3Bsx4w" id="(0.6133333333333333,0.12195121951219512)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yhg7dnEeau1vMV3Bsx4w" id="(0.5,7.538461538461538)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6YhhLdnEeau1vMV3Bsx4w" type="4001" element="_l6Zu5bdnEeau1vMV3Bsx4w" source="_l6X4ubdnEeau1vMV3Bsx4w" target="_l6X4q7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6YhhbdnEeau1vMV3Bsx4w" type="6001">
@@ -8404,8 +8622,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yhi7dnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6YhjLdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YhjbdnEeau1vMV3Bsx4w" points="[0, 0, -760, 60]$[760, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhjrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZGsLdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YhjrdnEeau1vMV3Bsx4w" id="(0.49333333333333335,0.04878048780487805)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZGsLdnEeau1vMV3Bsx4w" id="(0.5,7.538461538461538)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6ZGsbdnEeau1vMV3Bsx4w" type="4001" element="_l6Zu6bdnEeau1vMV3Bsx4w" source="_l6X4wLdnEeau1vMV3Bsx4w" target="_l6X4q7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6ZGsrdnEeau1vMV3Bsx4w" type="6001">
@@ -8420,8 +8638,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6ZGuLdnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6ZGubdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZGurdnEeau1vMV3Bsx4w" points="[0, 0, -580, 60]$[580, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZGu7dnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZGvLdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZGu7dnEeau1vMV3Bsx4w" id="(0.5866666666666667,0.04878048780487805)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZGvLdnEeau1vMV3Bsx4w" id="(0.5,7.538461538461538)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6ZGvbdnEeau1vMV3Bsx4w" type="4001" element="_l6Zu7bdnEeau1vMV3Bsx4w" source="_l6X4x7dnEeau1vMV3Bsx4w" target="_l6X4q7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6ZGvrdnEeau1vMV3Bsx4w" type="6001">
@@ -8435,9 +8653,9 @@
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6ZGxLdnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6ZGxbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZGxrdnEeau1vMV3Bsx4w" points="[0, 0, -1120, 60]$[1120, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZGx7dnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZGyLdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZGxrdnEeau1vMV3Bsx4w" points="[0, 0, 276, -161]$[0, -76, 276, -237]$[-275, -76, 1, -237]$[-275, -94, 1, -255]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZGx7dnEeau1vMV3Bsx4w" id="(0.8082191780821918,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZGyLdnEeau1vMV3Bsx4w" id="(0.5,7.538461538461538)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6ZGybdnEeau1vMV3Bsx4w" type="4001" element="_l6Zu8bdnEeau1vMV3Bsx4w" source="_l6X4zrdnEeau1vMV3Bsx4w" target="_l6X4q7dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6ZGyrdnEeau1vMV3Bsx4w" type="6001">
@@ -8452,24 +8670,24 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6ZG0LdnEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6ZG0bdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZG0rdnEeau1vMV3Bsx4w" points="[0, 0, -400, 60]$[400, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZG07dnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZG1LdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZG07dnEeau1vMV3Bsx4w" id="(0.52,0.0975609756097561)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZG1LdnEeau1vMV3Bsx4w" id="(0.5,7.538461538461538)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6ZHNbdnEeau1vMV3Bsx4w" type="4001" element="_l6ZvHbdnEeau1vMV3Bsx4w" source="_l6X5ELdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6ZHNrdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHN7dnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHN7dnEeau1vMV3Bsx4w" x="-103" y="38"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6ZHOLdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHObdnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHObdnEeau1vMV3Bsx4w" x="88"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6ZHOrdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHO7dnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHO7dnEeau1vMV3Bsx4w" x="31" y="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6ZHPLdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6ZHPbdnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZHPrdnEeau1vMV3Bsx4w" points="[0, 0, -1986, 60]$[1986, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHP7dnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHQLdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZHPrdnEeau1vMV3Bsx4w" points="[0, 0, -226, 324]$[0, -170, -226, 154]$[167, -170, -59, 154]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHP7dnEeau1vMV3Bsx4w" id="(0.11666666666666667,0.024390243902439025)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHQLdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6ZHQbdnEeau1vMV3Bsx4w" type="4001" element="_l6ZvIbdnEeau1vMV3Bsx4w" source="_l6X5ELdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6ZHQrdnEeau1vMV3Bsx4w" type="6001">
@@ -8485,39 +8703,39 @@
           <styles xmi:type="notation:FontStyle" xmi:id="_l6ZHSbdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZHSrdnEeau1vMV3Bsx4w" points="[0, 0, -1986, 60]$[1986, -60, 0, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHS7dnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHTLdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHTLdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6ZHTbdnEeau1vMV3Bsx4w" type="4001" element="_l6ZvJbdnEeau1vMV3Bsx4w" source="_l6X5ELdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6ZHTrdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHT7dnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHT7dnEeau1vMV3Bsx4w" x="-89" y="-31"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6ZHULdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHUbdnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHUbdnEeau1vMV3Bsx4w" x="132" y="77"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6ZHUrdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHU7dnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHU7dnEeau1vMV3Bsx4w" x="18" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6ZHVLdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6ZHVbdnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZHVrdnEeau1vMV3Bsx4w" points="[0, 0, -1986, 60]$[1986, -60, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZHVrdnEeau1vMV3Bsx4w" points="[37, 0, -143, 324]$[37, -158, -143, 166]$[121, -158, -59, 166]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHV7dnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHWLdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHWLdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6ZHWbdnEeau1vMV3Bsx4w" type="4001" element="_l6ZvKbdnEeau1vMV3Bsx4w" source="_l6X5ELdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6ZHWrdnEeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHW7dnEeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHW7dnEeau1vMV3Bsx4w" x="-76" y="40"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6ZHXLdnEeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHXbdnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHXbdnEeau1vMV3Bsx4w" x="122" y="65"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_l6ZHXrdnEeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHX7dnEeau1vMV3Bsx4w" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6ZHX7dnEeau1vMV3Bsx4w" x="17" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6ZHYLdnEeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_l6ZHYbdnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZHYrdnEeau1vMV3Bsx4w" points="[0, 0, -1986, 60]$[1986, -60, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHY7dnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHZLdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZHYrdnEeau1vMV3Bsx4w" points="[-3, -3, -131, 324]$[-3, -147, -131, 180]$[69, -147, -59, 180]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHY7dnEeau1vMV3Bsx4w" id="(0.9416666666666667,0.0975609756097561)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZHZLdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_l6ZH9bdnEeau1vMV3Bsx4w" type="4001" element="_l6ZvZ7dnEeau1vMV3Bsx4w" source="_l6X5M7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_l6ZH9rdnEeau1vMV3Bsx4w" type="6001">
@@ -8533,55 +8751,55 @@
           <styles xmi:type="notation:FontStyle" xmi:id="_l6ZH_bdnEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6ZH_rdnEeau1vMV3Bsx4w" points="[0, 0, -2202, 60]$[2202, -60, 0, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZH_7dnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZIALdnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ZIALdnEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_kRvlgLd1Eeau1vMV3Bsx4w" type="4001" element="_kQZhsLd1Eeau1vMV3Bsx4w" source="_YvbY4Ld1Eeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_kRyBwLd1Eeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kRyBwbd1Eeau1vMV3Bsx4w" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kRyBwbd1Eeau1vMV3Bsx4w" x="-65" y="-138"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_kRzP4Ld1Eeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kRzP4bd1Eeau1vMV3Bsx4w" x="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kRzP4bd1Eeau1vMV3Bsx4w" x="75" y="31"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_kRz28Ld1Eeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kRz28bd1Eeau1vMV3Bsx4w" x="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kRz28bd1Eeau1vMV3Bsx4w" x="-28"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_kRvlgbd1Eeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_kRvlgrd1Eeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kRvlg7d1Eeau1vMV3Bsx4w" points="[0, 0, 341, 383]$[0, -191, 341, 192]$[-341, -191, 0, 192]$[-341, -382, 0, 1]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kR0eALd1Eeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kR0eAbd1Eeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kRvlg7d1Eeau1vMV3Bsx4w" points="[20, 74, 347, 324]$[20, -96, 347, 154]$[-268, -96, 59, 154]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kR0eALd1Eeau1vMV3Bsx4w" id="(0.5,-1.8823529411764706)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kR0eAbd1Eeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_JfzI0Ld8Eeau1vMV3Bsx4w" type="4001" element="_JfkfULd8Eeau1vMV3Bsx4w" source="_l6XSGLdnEeau1vMV3Bsx4w" target="_JfwFgLd8Eeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_Jfzv4Ld8Eeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jfzv4bd8Eeau1vMV3Bsx4w" x="-4"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jfzv4bd8Eeau1vMV3Bsx4w"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Jfzv4rd8Eeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jfzv47d8Eeau1vMV3Bsx4w" x="21"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jfzv47d8Eeau1vMV3Bsx4w" x="15"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Jfzv5Ld8Eeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jfzv5bd8Eeau1vMV3Bsx4w" x="-20" y="34"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jfzv5bd8Eeau1vMV3Bsx4w" x="6"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_JfzI0bd8Eeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_JfzI0rd8Eeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JfzI07d8Eeau1vMV3Bsx4w" points="[44, 98, -41, -145]$[44, 145, -41, -98]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Jf4BULd8Eeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Jf4BUbd8Eeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JfzI07d8Eeau1vMV3Bsx4w" points="[-1, 113, -13, -189]$[-1, 150, -13, -152]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Jf4BULd8Eeau1vMV3Bsx4w" id="(0.5,-1.8823529411764706)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Jf4BUbd8Eeau1vMV3Bsx4w" id="(0.5,3.92)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_LuBT4Ld8Eeau1vMV3Bsx4w" type="4001" element="_LsuTYLd8Eeau1vMV3Bsx4w" source="_YvbY4Ld1Eeau1vMV3Bsx4w" target="_JfwFgLd8Eeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_LuB68Ld8Eeau1vMV3Bsx4w" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LuB68bd8Eeau1vMV3Bsx4w" x="9" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LuB68bd8Eeau1vMV3Bsx4w" x="15" y="-7"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_LuB68rd8Eeau1vMV3Bsx4w" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LuB687d8Eeau1vMV3Bsx4w" x="13" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LuB687d8Eeau1vMV3Bsx4w" x="34" y="-214"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_LuB69Ld8Eeau1vMV3Bsx4w" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LuB69bd8Eeau1vMV3Bsx4w" x="2"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LuB69bd8Eeau1vMV3Bsx4w" x="61" y="-11"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_LuBT4bd8Eeau1vMV3Bsx4w" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_LuBT4rd8Eeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LuBT47d8Eeau1vMV3Bsx4w" points="[-65, 49, 0, -96]$[-65, 96, 0, -49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LuB69rd8Eeau1vMV3Bsx4w" id="(1.0,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LuB697d8Eeau1vMV3Bsx4w" id="(1.0,0.5)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LuBT47d8Eeau1vMV3Bsx4w" points="[-58, 57, -619, -207]$[-58, 197, -619, -67]$[443, 197, -118, -67]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LuB69rd8Eeau1vMV3Bsx4w" id="(1.0,-0.44117647058823534)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LuB697d8Eeau1vMV3Bsx4w" id="(1.0,1.96)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Bo3owLqxEeau1vMV3Bsx4w" type="4001" element="_BoaVwLqxEeau1vMV3Bsx4w" source="_YvbY4Ld1Eeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_Bo4P0LqxEeau1vMV3Bsx4w" type="6001">
@@ -8596,8 +8814,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_Bo3owbqxEeau1vMV3Bsx4w" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_Bo3owrqxEeau1vMV3Bsx4w" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Bo3ow7qxEeau1vMV3Bsx4w" points="[0, 0, 341, 383]$[-341, -382, 0, 1]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8LqxEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8bqxEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8LqxEeau1vMV3Bsx4w" id="(0.5,-1.8823529411764706)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8bqxEeau1vMV3Bsx4w" id="(0.5,0.3514376996805112)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_zFvSUHuWEeeCn_RNMwgEBg" type="4001" element="_zEk0sHuWEeeCn_RNMwgEBg" source="_Xh-bUHuWEeeCn_RNMwgEBg" target="_l6XR87dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_zFv5YHuWEeeCn_RNMwgEBg" type="6001">
@@ -8613,55 +8831,55 @@
           <styles xmi:type="notation:FontStyle" xmi:id="_zFvSUnuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zFvSU3uWEeeCn_RNMwgEBg" points="[0, 0, 142, 198]$[-142, -197, 0, 1]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgcnuWEeeCn_RNMwgEBg" id="(0.5932203389830508,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgc3uWEeeCn_RNMwgEBg" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgc3uWEeeCn_RNMwgEBg" id="(0.5,32.666666666666664)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Vj8LgIKgEeeAppuRs-roLg" type="4001" element="_Vi5psIKgEeeAppuRs-roLg" source="_PSQLAIKgEeeAppuRs-roLg" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_VkF8gIKgEeeAppuRs-roLg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VkF8gYKgEeeAppuRs-roLg" x="-31" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VkF8gYKgEeeAppuRs-roLg" x="-106" y="-49"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_VkF8goKgEeeAppuRs-roLg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VkF8g4KgEeeAppuRs-roLg" x="-8" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VkF8g4KgEeeAppuRs-roLg" x="-8"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_VkF8hIKgEeeAppuRs-roLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VkF8hYKgEeeAppuRs-roLg" x="-25" y="223"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VkF8hYKgEeeAppuRs-roLg" x="-2" y="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_Vj8LgYKgEeeAppuRs-roLg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_Vj8LgoKgEeeAppuRs-roLg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vj8Lg4KgEeeAppuRs-roLg" points="[0, 0, 352, 201]$[-410, 0, -58, 201]$[-410, -114, -58, 87]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VkF8hoKgEeeAppuRs-roLg" id="(0.0,0.6122448979591837)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VkF8h4KgEeeAppuRs-roLg" id="(1.0,0.11224489795918367)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vj8Lg4KgEeeAppuRs-roLg" points="[34, -75, 108, 412]$[34, -220, 108, 267]$[-74, -220, 0, 267]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VkF8hoKgEeeAppuRs-roLg" id="(0.0,1.935483870967742)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VkF8h4KgEeeAppuRs-roLg" id="(1.0,0.07348242811501597)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_YR4_gIKgEeeAppuRs-roLg" type="4001" element="_YRIxkIKgEeeAppuRs-roLg" source="_PSQLAIKgEeeAppuRs-roLg" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_YR4_hIKgEeeAppuRs-roLg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YR4_hYKgEeeAppuRs-roLg" x="-22" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YR4_hYKgEeeAppuRs-roLg" x="-132" y="58"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_YR4_hoKgEeeAppuRs-roLg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YR4_h4KgEeeAppuRs-roLg" x="-5" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YR4_h4KgEeeAppuRs-roLg" x="-14"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_YR4_iIKgEeeAppuRs-roLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YR4_iYKgEeeAppuRs-roLg" y="218"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YR4_iYKgEeeAppuRs-roLg" x="4" y="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_YR4_gYKgEeeAppuRs-roLg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_YR4_goKgEeeAppuRs-roLg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YR4_g4KgEeeAppuRs-roLg" points="[0, 0, 352, 165]$[-410, 0, -58, 165]$[-410, -84, -58, 81]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YR4_ioKgEeeAppuRs-roLg" id="(0.0,0.30612244897959184)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YR4_i4KgEeeAppuRs-roLg" id="(1.0,0.17346938775510204)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YR4_g4KgEeeAppuRs-roLg" points="[72, -37, 146, 406]$[72, -196, 146, 247]$[-74, -196, 0, 247]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YR4_ioKgEeeAppuRs-roLg" id="(0.0,0.967741935483871)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YR4_i4KgEeeAppuRs-roLg" id="(1.0,0.09265175718849838)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_e12bwIKgEeeAppuRs-roLg" type="4001" element="_e1Zv0IKgEeeAppuRs-roLg" source="_l6XR7LdnEeau1vMV3Bsx4w" target="_e1tR0IKgEeeAppuRs-roLg">
           <children xmi:type="notation:Node" xmi:id="_e12bxIKgEeeAppuRs-roLg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e12bxYKgEeeAppuRs-roLg" x="-22" y="125"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e12bxYKgEeeAppuRs-roLg" x="-221" y="70"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_e12bxoKgEeeAppuRs-roLg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e12bx4KgEeeAppuRs-roLg" x="-32" y="37"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e12bx4KgEeeAppuRs-roLg" x="-28"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_e12byIKgEeeAppuRs-roLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e12byYKgEeeAppuRs-roLg" x="-44" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e12byYKgEeeAppuRs-roLg" x="-20"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_e12bwYKgEeeAppuRs-roLg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_e12bwoKgEeeAppuRs-roLg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e12bw4KgEeeAppuRs-roLg" points="[16, 49, 241, 369]$[16, 112, 241, 432]$[-241, 112, -16, 432]$[-241, -271, -16, 49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e12byoKgEeeAppuRs-roLg" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e12by4KgEeeAppuRs-roLg" id="(0.5,0.5)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e12bw4KgEeeAppuRs-roLg" points="[49, -49, 109, 364]$[49, -457, 109, -44]$[0, -457, 60, -44]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e12byoKgEeeAppuRs-roLg" id="(0.5,1.2564102564102564)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e12by4KgEeeAppuRs-roLg" id="(0.5,1.3877995642701526)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_e12bzIKgEeeAppuRs-roLg" type="4001" element="_e1jg0IKgEeeAppuRs-roLg" source="_l6XSGLdnEeau1vMV3Bsx4w" target="_e1tR0IKgEeeAppuRs-roLg">
           <children xmi:type="notation:Node" xmi:id="_e2AMwIKgEeeAppuRs-roLg" type="6001">
@@ -8676,8 +8894,8 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_e12bzYKgEeeAppuRs-roLg" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_e12bzoKgEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e12bz4KgEeeAppuRs-roLg" points="[1760, 440, 1760, 440]$[0, 0, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AMxoKgEeeAppuRs-roLg" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AMx4KgEeeAppuRs-roLg" id="(0.5,0.5)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AMxoKgEeeAppuRs-roLg" id="(0.5,-0.44117647058823534)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AMx4KgEeeAppuRs-roLg" id="(0.5,1.3877995642701526)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_e2AMyIKgEeeAppuRs-roLg" type="4001" element="_e1jg1IKgEeeAppuRs-roLg" source="_e1tR0IKgEeeAppuRs-roLg" target="_l6X43LdnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_e2AMzIKgEeeAppuRs-roLg" type="6001">
@@ -8692,24 +8910,24 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_e2AMyYKgEeeAppuRs-roLg" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_e2AMyoKgEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e2AMy4KgEeeAppuRs-roLg" points="[0, 0, 0, 0]$[2855, -1, 2855, -1]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AM0oKgEeeAppuRs-roLg" id="(0.5,0.5)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AM0oKgEeeAppuRs-roLg" id="(0.5,1.3877995642701526)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AM04KgEeeAppuRs-roLg" id="(0.5,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_hTVVYIKhEeeAppuRs-roLg" type="4001" element="_hS4pcIKhEeeAppuRs-roLg" source="_hTMLdIKhEeeAppuRs-roLg" target="_JfwFgLd8Eeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_hTVVZIKhEeeAppuRs-roLg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVZYKhEeeAppuRs-roLg" x="92" y="21"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVZYKhEeeAppuRs-roLg" x="40" y="14"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_hTVVZoKhEeeAppuRs-roLg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVZ4KhEeeAppuRs-roLg" x="244" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVZ4KhEeeAppuRs-roLg" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_hTVVaIKhEeeAppuRs-roLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVaYKhEeeAppuRs-roLg" x="31" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVaYKhEeeAppuRs-roLg" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hTVVYYKhEeeAppuRs-roLg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_hTVVYoKhEeeAppuRs-roLg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hTVVY4KhEeeAppuRs-roLg" points="[-97, 49, 353, -490]$[-97, 508, 353, -31]$[-391, 508, 59, -31]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVaoKhEeeAppuRs-roLg" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVa4KhEeeAppuRs-roLg" id="(0.5,0.5)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hTVVY4KhEeeAppuRs-roLg" points="[103, -17, -585, -44]$[629, -17, -59, -44]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVaoKhEeeAppuRs-roLg" id="(0.5,1.105902777777778)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVa4KhEeeAppuRs-roLg" id="(0.5,1.96)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_hTVVbIKhEeeAppuRs-roLg" type="4001" element="_hTMLcIKhEeeAppuRs-roLg" source="_hTMLdIKhEeeAppuRs-roLg" target="_e1tR0IKgEeeAppuRs-roLg">
           <children xmi:type="notation:Node" xmi:id="_hTVVcIKhEeeAppuRs-roLg" type="6001">
@@ -8719,29 +8937,29 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVc4KhEeeAppuRs-roLg" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_hTVVdIKhEeeAppuRs-roLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVdYKhEeeAppuRs-roLg" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVdYKhEeeAppuRs-roLg" x="-3" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_hTVVbYKhEeeAppuRs-roLg" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_hTVVboKhEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hTVVb4KhEeeAppuRs-roLg" points="[0, 0, 0, 0]$[2020, -111, 2020, -111]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVdoKhEeeAppuRs-roLg" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVd4KhEeeAppuRs-roLg" id="(0.5,0.5)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hTVVb4KhEeeAppuRs-roLg" points="[0, -53, -85, 362]$[0, -413, -85, 2]$[86, -413, 1, 2]$[86, -434, 1, -19]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVdoKhEeeAppuRs-roLg" id="(0.7980769230769231,0.3)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVd4KhEeeAppuRs-roLg" id="(0.5,1.3877995642701526)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_mN2HkIKhEeeAppuRs-roLg" type="4001" element="_mNGgsIKhEeeAppuRs-roLg" source="_PSQLAIKgEeeAppuRs-roLg" target="_hTMLdIKhEeeAppuRs-roLg">
           <children xmi:type="notation:Node" xmi:id="_mN2HlIKhEeeAppuRs-roLg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mN2HlYKhEeeAppuRs-roLg" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mN2HlYKhEeeAppuRs-roLg" x="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_mN2HloKhEeeAppuRs-roLg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mN2Hl4KhEeeAppuRs-roLg" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mN2Hl4KhEeeAppuRs-roLg" x="133"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_mN2HmIKhEeeAppuRs-roLg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mN2HmYKhEeeAppuRs-roLg" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mN2HmYKhEeeAppuRs-roLg" x="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_mN2HkYKhEeeAppuRs-roLg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_mN2HkoKhEeeAppuRs-roLg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mN2Hk4KhEeeAppuRs-roLg" points="[0, 0, -166, 66]$[166, -66, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mN2Hk4KhEeeAppuRs-roLg" points="[-1, 39, 20, -232]$[-1, 165, 20, -106]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2HmoKhEeeAppuRs-roLg" id="(0.5,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2Hm4KhEeeAppuRs-roLg" id="(0.3592233009708738,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2Hm4KhEeeAppuRs-roLg" id="(0.3592233009708738,2.211805555555556)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_sHL8sIKlEeeAppuRs-roLg" type="4001" element="_sGSk0IKlEeeAppuRs-roLg" source="_PSQLAIKgEeeAppuRs-roLg" target="_l6XR27dnEeau1vMV3Bsx4w">
           <children xmi:type="notation:Node" xmi:id="_sHL8tIKlEeeAppuRs-roLg" type="6001">
@@ -8756,1332 +8974,1669 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_sHL8sYKlEeeAppuRs-roLg" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_sHL8soKlEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sHL8s4KlEeeAppuRs-roLg" points="[0, 0, 471, 203]$[-469, -202, 2, 1]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sHL8uoKlEeeAppuRs-roLg" id="(0.0,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sHL8u4KlEeeAppuRs-roLg" id="(0.5,1.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sHL8uoKlEeeAppuRs-roLg" id="(0.0,1.5806451612903225)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sHL8u4KlEeeAppuRs-roLg" id="(0.5,0.3514376996805112)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_OEPgQG6MEemSyfDlsGAqLA" type="4001" element="_OC7Rpm6MEemSyfDlsGAqLA" source="_JB2kcG6MEemSyfDlsGAqLA" target="_l6X4q7dnEeau1vMV3Bsx4w">
+          <children xmi:type="notation:Node" xmi:id="_OEQHUG6MEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OEQHUW6MEemSyfDlsGAqLA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_OEQHUm6MEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OEQHU26MEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_OEQHVG6MEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OEQHVW6MEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_OEPgQW6MEemSyfDlsGAqLA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_OEPgQm6MEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OEPgQ26MEemSyfDlsGAqLA" points="[0, 0, -336, 132]$[336, -132, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OEQHVm6MEemSyfDlsGAqLA" id="(0.5866666666666667,0.0975609756097561)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OEQuYG6MEemSyfDlsGAqLA" id="(0.5,7.538461538461538)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_zblloG6WEemSyfDlsGAqLA" type="4001" element="_za0wsm6WEemSyfDlsGAqLA" source="_rsImoG6WEemSyfDlsGAqLA" target="_l6XR27dnEeau1vMV3Bsx4w">
+          <children xmi:type="notation:Node" xmi:id="_zbllpG6WEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zbllpW6WEemSyfDlsGAqLA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_zbllpm6WEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zbllp26WEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_zbllqG6WEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zbllqW6WEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_zblloW6WEemSyfDlsGAqLA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_zbllom6WEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zbllo26WEemSyfDlsGAqLA" points="[0, 0, 962, 255]$[-962, -255, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zbmMsG6WEemSyfDlsGAqLA" id="(0.5639097744360902,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zbmMsW6WEemSyfDlsGAqLA" id="(0.5,0.3514376996805112)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_hKdI4G6cEemSyfDlsGAqLA" type="4001" element="_hJ8ymW6cEemSyfDlsGAqLA" source="_rsImoG6WEemSyfDlsGAqLA" target="_hTMLdIKhEeeAppuRs-roLg">
+          <children xmi:type="notation:Node" xmi:id="_hKdv8G6cEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hKdv8W6cEemSyfDlsGAqLA" x="143" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hKdv8m6cEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hKdv826cEemSyfDlsGAqLA" x="27"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_hKdv9G6cEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hKdv9W6cEemSyfDlsGAqLA" x="136" y="5"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hKdI4W6cEemSyfDlsGAqLA" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_hKdI4m6cEemSyfDlsGAqLA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hKdI426cEemSyfDlsGAqLA" points="[15, 30, 720, -126]$[15, 228, 720, 72]$[-765, 228, -60, 72]$[-765, 204, -60, 48]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hKdv9m6cEemSyfDlsGAqLA" id="(0.0,0.23076923076923078)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hKdv926cEemSyfDlsGAqLA" id="(0.6990291262135923,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_wpitEG6cEemSyfDlsGAqLA" type="4001" element="_wovb6G6cEemSyfDlsGAqLA" source="_53F0AG6XEemSyfDlsGAqLA" target="_rsImoG6WEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_wpitFG6cEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wpitFW6cEemSyfDlsGAqLA" x="8" y="16"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_wpitFm6cEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wpitF26cEemSyfDlsGAqLA" x="31" y="-3"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_wpitGG6cEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wpitGW6cEemSyfDlsGAqLA" x="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_wpitEW6cEemSyfDlsGAqLA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_wpitEm6cEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wpitE26cEemSyfDlsGAqLA" points="[0, -19, 23, 84]$[0, -41, 23, 62]$[-22, -41, 1, 62]$[-22, -83, 1, 20]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JRfTMG6dEemSyfDlsGAqLA" id="(0.52,0.1951219512195122)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wpjUIW6cEemSyfDlsGAqLA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_OLM0IG6dEemSyfDlsGAqLA" type="4001" element="_OKfpkm6dEemSyfDlsGAqLA" source="_9KcB0G6cEemSyfDlsGAqLA" target="_rsImoG6WEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_OLNbMG6dEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OLNbMW6dEemSyfDlsGAqLA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_OLNbMm6dEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OLNbM26dEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_OLOCQG6dEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OLOCQW6dEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_OLM0IW6dEemSyfDlsGAqLA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_OLM0Im6dEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OLM0I26dEemSyfDlsGAqLA" points="[0, 0, 220, 94]$[-220, -94, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OLOCQm6dEemSyfDlsGAqLA" id="(0.4088397790055249,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OLOCQ26dEemSyfDlsGAqLA" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_OqkQsG6dEemSyfDlsGAqLA" type="4001" element="_Op-a0G6dEemSyfDlsGAqLA" source="_31nEcG6XEemSyfDlsGAqLA" target="_9KcB0G6cEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_Oqk3wG6dEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Oqk3wW6dEemSyfDlsGAqLA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Oqk3wm6dEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Oqk3w26dEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Oqk3xG6dEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Oqk3xW6dEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_OqkQsW6dEemSyfDlsGAqLA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_OqkQsm6dEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OqkQs26dEemSyfDlsGAqLA" points="[-35, 4, -8, 56]$[-35, -14, -8, 38]$[-26, -14, 1, 38]$[-26, -32, 1, 20]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Oqk3xm6dEemSyfDlsGAqLA" id="(0.6333333333333333,0.12195121951219512)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Oqk3x26dEemSyfDlsGAqLA" id="(0.5,0.38235294117647056)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_PAyYUG6dEemSyfDlsGAqLA" type="4001" element="_PALUXG6dEemSyfDlsGAqLA" source="_8nYKUG6XEemSyfDlsGAqLA" target="_9KcB0G6cEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_PAy_YG6dEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAy_YW6dEemSyfDlsGAqLA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_PAy_Ym6dEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAy_Y26dEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_PAy_ZG6dEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAy_ZW6dEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_PAyYUW6dEemSyfDlsGAqLA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_PAyYUm6dEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PAyYU26dEemSyfDlsGAqLA" points="[0, 0, -29, 32]$[29, -32, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PAy_Zm6dEemSyfDlsGAqLA" id="(0.3927595628415301,0.17073170731707318)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PAy_Z26dEemSyfDlsGAqLA" id="(0.5,0.38235294117647056)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_PSaT0G6dEemSyfDlsGAqLA" type="4001" element="_PRtwRm6dEemSyfDlsGAqLA" source="_-vo3UG6XEemSyfDlsGAqLA" target="_9KcB0G6cEemSyfDlsGAqLA">
+          <children xmi:type="notation:Node" xmi:id="_PSaT1G6dEemSyfDlsGAqLA" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSaT1W6dEemSyfDlsGAqLA" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_PSa64G6dEemSyfDlsGAqLA" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSa64W6dEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_PSa64m6dEemSyfDlsGAqLA" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSa6426dEemSyfDlsGAqLA" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_PSaT0W6dEemSyfDlsGAqLA" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_PSaT0m6dEemSyfDlsGAqLA" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PSaT026dEemSyfDlsGAqLA" points="[0, 0, 115, 32]$[-115, -32, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PSa65G6dEemSyfDlsGAqLA" id="(1.0172413793103448,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PSa65W6dEemSyfDlsGAqLA" id="(0.5,0.38235294117647056)"/>
         </edges>
       </data>
     </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIGbdnEeau1vMV3Bsx4w" name="Term" tooltipText="" outgoingEdges="_l6ZufbdnEeau1vMV3Bsx4w" incomingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6Zt9bdnEeau1vMV3Bsx4w _l6Zt-bdnEeau1vMV3Bsx4w _l6Zt_bdnEeau1vMV3Bsx4w _l6ZuAbdnEeau1vMV3Bsx4w _l6ZuBbdnEeau1vMV3Bsx4w _l6ZuCbdnEeau1vMV3Bsx4w _l6ZuDbdnEeau1vMV3Bsx4w _l6ZuEbdnEeau1vMV3Bsx4w _l6ZuFbdnEeau1vMV3Bsx4w _l6ZuGbdnEeau1vMV3Bsx4w _l6ZuHbdnEeau1vMV3Bsx4w _l6ZuIbdnEeau1vMV3Bsx4w _l6ZuJbdnEeau1vMV3Bsx4w _l6ZuKbdnEeau1vMV3Bsx4w _l6ZuLbdnEeau1vMV3Bsx4w _l6ZuMbdnEeau1vMV3Bsx4w _l6ZuNbdnEeau1vMV3Bsx4w _l6ZuObdnEeau1vMV3Bsx4w _l6ZuPbdnEeau1vMV3Bsx4w _l6ZuQbdnEeau1vMV3Bsx4w _l6ZuRbdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _l6ZuibdnEeau1vMV3Bsx4w _l6ZunbdnEeau1vMV3Bsx4w _l6ZuqbdnEeau1vMV3Bsx4w _l6ZuwbdnEeau1vMV3Bsx4w _l6Zu3bdnEeau1vMV3Bsx4w _l6ZvHbdnEeau1vMV3Bsx4w _l6ZvIbdnEeau1vMV3Bsx4w _l6ZvJbdnEeau1vMV3Bsx4w _l6ZvKbdnEeau1vMV3Bsx4w _l6ZvZ7dnEeau1vMV3Bsx4w _kQZhsLd1Eeau1vMV3Bsx4w _BoaVwLqxEeau1vMV3Bsx4w _Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg _sGSk0IKlEeeAppuRs-roLg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIGbdnEeau1vMV3Bsx4w" name="Term" tooltipText="" outgoingEdges="_l6ZufbdnEeau1vMV3Bsx4w" incomingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6Zt9bdnEeau1vMV3Bsx4w _l6Zt-bdnEeau1vMV3Bsx4w _l6Zt_bdnEeau1vMV3Bsx4w _l6ZuAbdnEeau1vMV3Bsx4w _l6ZuBbdnEeau1vMV3Bsx4w _l6ZuCbdnEeau1vMV3Bsx4w _l6ZuDbdnEeau1vMV3Bsx4w _l6ZuEbdnEeau1vMV3Bsx4w _l6ZuFbdnEeau1vMV3Bsx4w _l6ZuGbdnEeau1vMV3Bsx4w _l6ZuHbdnEeau1vMV3Bsx4w _l6ZuIbdnEeau1vMV3Bsx4w _l6ZuJbdnEeau1vMV3Bsx4w _l6ZuKbdnEeau1vMV3Bsx4w _l6ZuLbdnEeau1vMV3Bsx4w _l6ZuMbdnEeau1vMV3Bsx4w _l6ZuNbdnEeau1vMV3Bsx4w _l6ZuObdnEeau1vMV3Bsx4w _l6ZuPbdnEeau1vMV3Bsx4w _l6ZuQbdnEeau1vMV3Bsx4w _l6ZuRbdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _l6ZuibdnEeau1vMV3Bsx4w _l6ZunbdnEeau1vMV3Bsx4w _l6ZuqbdnEeau1vMV3Bsx4w _l6ZuwbdnEeau1vMV3Bsx4w _l6Zu3bdnEeau1vMV3Bsx4w _l6ZvHbdnEeau1vMV3Bsx4w _l6ZvIbdnEeau1vMV3Bsx4w _l6ZvJbdnEeau1vMV3Bsx4w _l6ZvKbdnEeau1vMV3Bsx4w _l6ZvZ7dnEeau1vMV3Bsx4w _kQZhsLd1Eeau1vMV3Bsx4w _BoaVwLqxEeau1vMV3Bsx4w _Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg _sGSk0IKlEeeAppuRs-roLg _za0wsm6WEemSyfDlsGAqLA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIGrdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIGrdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIH7dnEeau1vMV3Bsx4w" name="SymbolicValue" tooltipText="" outgoingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _e1Zv0IKgEeeAppuRs-roLg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIH7dnEeau1vMV3Bsx4w" name="SymbolicValue" tooltipText="" outgoingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _e1Zv0IKgEeeAppuRs-roLg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIILdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIILdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIIbdnEeau1vMV3Bsx4w" name="AtomicTerm" tooltipText="" outgoingEdges="_l6ZuibdnEeau1vMV3Bsx4w" incomingEdges="_l6ZujbdnEeau1vMV3Bsx4w _l6ZukbdnEeau1vMV3Bsx4w _l6ZulbdnEeau1vMV3Bsx4w _zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIIbdnEeau1vMV3Bsx4w" name="AtomicTerm" tooltipText="" outgoingEdges="_l6ZuibdnEeau1vMV3Bsx4w" incomingEdges="_l6ZujbdnEeau1vMV3Bsx4w _l6ZukbdnEeau1vMV3Bsx4w _l6ZulbdnEeau1vMV3Bsx4w _zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIIrdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIIrdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZII7dnEeau1vMV3Bsx4w" name="IntLiteral" tooltipText="" outgoingEdges="_l6ZujbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZII7dnEeau1vMV3Bsx4w" name="IntLiteral" tooltipText="" outgoingEdges="_l6ZujbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntLiteral"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntLiteral"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIJLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIJLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZIJbdnEeau1vMV3Bsx4w" name="value : EInt" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_l6ZIJbdnEeau1vMV3Bsx4w" name="value : EInt" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//IntLiteral/value"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//IntLiteral/value"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_geTdIHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_geTdIHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIJ7dnEeau1vMV3Bsx4w" name="BoolLiteral" tooltipText="" outgoingEdges="_l6ZukbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIJ7dnEeau1vMV3Bsx4w" name="BoolLiteral" tooltipText="" outgoingEdges="_l6ZukbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolLiteral"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolLiteral"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIKLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIKLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZIKbdnEeau1vMV3Bsx4w" name="value : EBoolean = false" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_l6ZIKbdnEeau1vMV3Bsx4w" name="value : EBoolean = false" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//BoolLiteral/value"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//BoolLiteral/value"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_g7P30HuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_g7P30HuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIK7dnEeau1vMV3Bsx4w" name="RealLiteral" tooltipText="" outgoingEdges="_l6ZulbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIK7dnEeau1vMV3Bsx4w" name="RealLiteral" tooltipText="" outgoingEdges="_l6ZulbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealLiteral"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealLiteral"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZILLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZILLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_l6ZILbdnEeau1vMV3Bsx4w" name="value : EBigDecimal" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_l6ZILbdnEeau1vMV3Bsx4w" name="value : EBigDecimal" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//RealLiteral/value"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//RealLiteral/value"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_hXV98HuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_hXV98HuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIL7dnEeau1vMV3Bsx4w" name="Variable" tooltipText="" outgoingEdges="_JfkfULd8Eeau1vMV3Bsx4w _e1jg0IKgEeeAppuRs-roLg" incomingEdges="_l6Zt8bdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIL7dnEeau1vMV3Bsx4w" name="Variable" tooltipText="" outgoingEdges="_JfkfULd8Eeau1vMV3Bsx4w _e1jg0IKgEeeAppuRs-roLg" incomingEdges="_l6Zt8bdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIMLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIMLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIMbdnEeau1vMV3Bsx4w" name="QuantifiedExpression" tooltipText="" outgoingEdges="_l6Zt8bdnEeau1vMV3Bsx4w _l6Zt9bdnEeau1vMV3Bsx4w _l6ZunbdnEeau1vMV3Bsx4w" incomingEdges="_l6ZuobdnEeau1vMV3Bsx4w _l6ZupbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIMbdnEeau1vMV3Bsx4w" name="QuantifiedExpression" tooltipText="" outgoingEdges="_l6Zt8bdnEeau1vMV3Bsx4w _l6Zt9bdnEeau1vMV3Bsx4w _l6ZunbdnEeau1vMV3Bsx4w" incomingEdges="_l6ZuobdnEeau1vMV3Bsx4w _l6ZupbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//QuantifiedExpression"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//QuantifiedExpression"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIMrdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIMrdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIM7dnEeau1vMV3Bsx4w" name="Exists" tooltipText="" outgoingEdges="_l6ZuobdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIM7dnEeau1vMV3Bsx4w" name="Exists" tooltipText="" outgoingEdges="_l6ZuobdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Exists"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Exists"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZINLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZINLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZINbdnEeau1vMV3Bsx4w" name="Forall" tooltipText="" outgoingEdges="_l6ZupbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZINbdnEeau1vMV3Bsx4w" name="Forall" tooltipText="" outgoingEdges="_l6ZupbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Forall"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Forall"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZINrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZINrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIN7dnEeau1vMV3Bsx4w" name="BoolOperation" tooltipText="" outgoingEdges="_l6ZuqbdnEeau1vMV3Bsx4w" incomingEdges="_l6ZurbdnEeau1vMV3Bsx4w _l6ZusbdnEeau1vMV3Bsx4w _l6ZutbdnEeau1vMV3Bsx4w _l6ZuubdnEeau1vMV3Bsx4w _l6ZuvbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIN7dnEeau1vMV3Bsx4w" name="BoolOperation" tooltipText="" outgoingEdges="_l6ZuqbdnEeau1vMV3Bsx4w" incomingEdges="_l6ZurbdnEeau1vMV3Bsx4w _l6ZusbdnEeau1vMV3Bsx4w _l6ZutbdnEeau1vMV3Bsx4w _l6ZuubdnEeau1vMV3Bsx4w _l6ZuvbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolOperation"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolOperation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIOLdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIOLdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIObdnEeau1vMV3Bsx4w" name="And" tooltipText="" outgoingEdges="_l6Zt-bdnEeau1vMV3Bsx4w _l6ZurbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIObdnEeau1vMV3Bsx4w" name="And" tooltipText="" outgoingEdges="_l6Zt-bdnEeau1vMV3Bsx4w _l6ZurbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//And"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//And"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIOrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIOrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIO7dnEeau1vMV3Bsx4w" name="Or" tooltipText="" outgoingEdges="_l6Zt_bdnEeau1vMV3Bsx4w _l6ZusbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIO7dnEeau1vMV3Bsx4w" name="Or" tooltipText="" outgoingEdges="_l6Zt_bdnEeau1vMV3Bsx4w _l6ZusbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Or"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Or"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIPLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIPLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIPbdnEeau1vMV3Bsx4w" name="Impl" tooltipText="" outgoingEdges="_l6ZuAbdnEeau1vMV3Bsx4w _l6ZuBbdnEeau1vMV3Bsx4w _l6ZutbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIPbdnEeau1vMV3Bsx4w" name="Impl" tooltipText="" outgoingEdges="_l6ZuAbdnEeau1vMV3Bsx4w _l6ZuBbdnEeau1vMV3Bsx4w _l6ZutbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Impl"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Impl"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIPrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIPrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIP7dnEeau1vMV3Bsx4w" name="Not" tooltipText="" outgoingEdges="_l6ZuCbdnEeau1vMV3Bsx4w _l6ZuubdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIP7dnEeau1vMV3Bsx4w" name="Not" tooltipText="" outgoingEdges="_l6ZuCbdnEeau1vMV3Bsx4w _l6ZuubdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Not"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Not"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIQLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIQLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIQbdnEeau1vMV3Bsx4w" name="Iff" tooltipText="" outgoingEdges="_l6ZuDbdnEeau1vMV3Bsx4w _l6ZuEbdnEeau1vMV3Bsx4w _l6ZuvbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIQbdnEeau1vMV3Bsx4w" name="Iff" tooltipText="" outgoingEdges="_l6ZuDbdnEeau1vMV3Bsx4w _l6ZuEbdnEeau1vMV3Bsx4w _l6ZuvbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Iff"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Iff"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIQrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIQrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIQ7dnEeau1vMV3Bsx4w" name="PrimitiveRelation" tooltipText="" outgoingEdges="_l6ZuwbdnEeau1vMV3Bsx4w" incomingEdges="_l6ZuxbdnEeau1vMV3Bsx4w _l6ZuybdnEeau1vMV3Bsx4w _l6ZuzbdnEeau1vMV3Bsx4w _l6Zu0bdnEeau1vMV3Bsx4w _l6Zu1bdnEeau1vMV3Bsx4w _l6Zu2bdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIQ7dnEeau1vMV3Bsx4w" name="PrimitiveRelation" tooltipText="" outgoingEdges="_l6ZuwbdnEeau1vMV3Bsx4w" incomingEdges="_l6ZuxbdnEeau1vMV3Bsx4w _l6ZuybdnEeau1vMV3Bsx4w _l6ZuzbdnEeau1vMV3Bsx4w _l6Zu0bdnEeau1vMV3Bsx4w _l6Zu1bdnEeau1vMV3Bsx4w _l6Zu2bdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveRelation"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveRelation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIRLdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIRLdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIRbdnEeau1vMV3Bsx4w" name="Equals" tooltipText="" outgoingEdges="_l6ZuFbdnEeau1vMV3Bsx4w _l6ZuGbdnEeau1vMV3Bsx4w _l6ZuxbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIRbdnEeau1vMV3Bsx4w" name="Equals" tooltipText="" outgoingEdges="_l6ZuFbdnEeau1vMV3Bsx4w _l6ZuGbdnEeau1vMV3Bsx4w _l6ZuxbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Equals"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Equals"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIRrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZIRrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIR7dnEeau1vMV3Bsx4w" name="Distinct" tooltipText="" outgoingEdges="_l6ZuHbdnEeau1vMV3Bsx4w _l6ZuybdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIR7dnEeau1vMV3Bsx4w" name="Distinct" tooltipText="" outgoingEdges="_l6ZuHbdnEeau1vMV3Bsx4w _l6ZuybdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Distinct"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Distinct"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZISLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZISLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZISbdnEeau1vMV3Bsx4w" name="LessThan" tooltipText="" outgoingEdges="_l6ZuIbdnEeau1vMV3Bsx4w _l6ZuJbdnEeau1vMV3Bsx4w _l6ZuzbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZISbdnEeau1vMV3Bsx4w" name="LessThan" tooltipText="" outgoingEdges="_l6ZuIbdnEeau1vMV3Bsx4w _l6ZuJbdnEeau1vMV3Bsx4w _l6ZuzbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessThan"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessThan"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZISrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZISrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIS7dnEeau1vMV3Bsx4w" name="MoreThan" tooltipText="" outgoingEdges="_l6ZuKbdnEeau1vMV3Bsx4w _l6ZuLbdnEeau1vMV3Bsx4w _l6Zu0bdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIS7dnEeau1vMV3Bsx4w" name="MoreThan" tooltipText="" outgoingEdges="_l6ZuKbdnEeau1vMV3Bsx4w _l6ZuLbdnEeau1vMV3Bsx4w _l6Zu0bdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreThan"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreThan"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZITLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZITLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZITbdnEeau1vMV3Bsx4w" name="LessOrEqualThan" tooltipText="" outgoingEdges="_l6ZuMbdnEeau1vMV3Bsx4w _l6ZuNbdnEeau1vMV3Bsx4w _l6Zu1bdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZITbdnEeau1vMV3Bsx4w" name="LessOrEqualThan" tooltipText="" outgoingEdges="_l6ZuMbdnEeau1vMV3Bsx4w _l6ZuNbdnEeau1vMV3Bsx4w _l6Zu1bdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessOrEqualThan"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessOrEqualThan"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZITrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZITrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIT7dnEeau1vMV3Bsx4w" name="MoreOrEqualThan" tooltipText="" outgoingEdges="_l6ZuObdnEeau1vMV3Bsx4w _l6ZuPbdnEeau1vMV3Bsx4w _l6Zu2bdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZIT7dnEeau1vMV3Bsx4w" name="MoreOrEqualThan" tooltipText="" outgoingEdges="_l6ZuObdnEeau1vMV3Bsx4w _l6ZuPbdnEeau1vMV3Bsx4w _l6Zu2bdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreOrEqualThan"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreOrEqualThan"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZtwLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZtwLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZtwbdnEeau1vMV3Bsx4w" name="IntOperation" tooltipText="" outgoingEdges="_l6ZuQbdnEeau1vMV3Bsx4w _l6ZuRbdnEeau1vMV3Bsx4w _l6Zu3bdnEeau1vMV3Bsx4w" incomingEdges="_l6Zu4bdnEeau1vMV3Bsx4w _l6Zu5bdnEeau1vMV3Bsx4w _l6Zu6bdnEeau1vMV3Bsx4w _l6Zu7bdnEeau1vMV3Bsx4w _l6Zu8bdnEeau1vMV3Bsx4w" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntOperation"/>
-      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntOperation"/>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZtwbdnEeau1vMV3Bsx4w" name="NumericOperation" tooltipText="" outgoingEdges="_l6ZuQbdnEeau1vMV3Bsx4w _l6ZuRbdnEeau1vMV3Bsx4w _l6Zu3bdnEeau1vMV3Bsx4w" incomingEdges="_l6Zu4bdnEeau1vMV3Bsx4w _l6Zu5bdnEeau1vMV3Bsx4w _l6Zu6bdnEeau1vMV3Bsx4w _l6Zu7bdnEeau1vMV3Bsx4w _l6Zu8bdnEeau1vMV3Bsx4w _OC7Rpm6MEemSyfDlsGAqLA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//NumericOperation"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//NumericOperation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZtwrdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZtwrdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6Ztw7dnEeau1vMV3Bsx4w" name="Plus" tooltipText="" outgoingEdges="_l6Zu4bdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6Ztw7dnEeau1vMV3Bsx4w" name="Plus" tooltipText="" outgoingEdges="_l6Zu4bdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Plus"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Plus"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZtxLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZtxLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZtxbdnEeau1vMV3Bsx4w" name="Minus" tooltipText="" outgoingEdges="_l6Zu5bdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZtxbdnEeau1vMV3Bsx4w" name="Minus" tooltipText="" outgoingEdges="_l6Zu5bdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Minus"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Minus"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZtxrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZtxrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6Ztx7dnEeau1vMV3Bsx4w" name="Multiply" tooltipText="" outgoingEdges="_l6Zu6bdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6Ztx7dnEeau1vMV3Bsx4w" name="Multiply" tooltipText="" outgoingEdges="_l6Zu6bdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Multiply"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Multiply"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZtyLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZtyLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZtybdnEeau1vMV3Bsx4w" name="Divison" tooltipText="" outgoingEdges="_l6Zu7bdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZtybdnEeau1vMV3Bsx4w" name="Divison" tooltipText="" outgoingEdges="_l6Zu7bdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Divison"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Divison"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZtyrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZtyrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6Zty7dnEeau1vMV3Bsx4w" name="Mod" tooltipText="" outgoingEdges="_l6Zu8bdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6Zty7dnEeau1vMV3Bsx4w" name="Mod" tooltipText="" outgoingEdges="_l6Zu8bdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Mod"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Mod"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZtzLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZtzLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6Ztz7dnEeau1vMV3Bsx4w" name="TermDescription" tooltipText="" incomingEdges="_l6ZufbdnEeau1vMV3Bsx4w _e1jg1IKgEeeAppuRs-roLg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6Ztz7dnEeau1vMV3Bsx4w" name="TermDescription" tooltipText="" incomingEdges="_l6ZufbdnEeau1vMV3Bsx4w _e1jg1IKgEeeAppuRs-roLg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6Zt0LdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6Zt0LdnEeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_interface.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.0/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zt6bdnEeau1vMV3Bsx4w" name="[0..*] parameterSubstitutions" sourceNode="_l6ZIH7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zt6bdnEeau1vMV3Bsx4w" name="[0..*] parameterSubstitutions" sourceNode="_l6ZIH7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/parameterSubstitutions"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/parameterSubstitutions"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zt6rdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zt67dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zt6rdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zt67dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6Zt7LdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6Zt7LdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zt8bdnEeau1vMV3Bsx4w" name="[0..*] quantifiedVariables" sourceNode="_l6ZIMbdnEeau1vMV3Bsx4w" targetNode="_l6ZIL7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zt8bdnEeau1vMV3Bsx4w" name="[0..*] quantifiedVariables" sourceNode="_l6ZIMbdnEeau1vMV3Bsx4w" targetNode="_l6ZIL7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//QuantifiedExpression/quantifiedVariables"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//QuantifiedExpression/quantifiedVariables"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zt8rdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zt87dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zt8rdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zt87dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6Zt9LdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6Zt9LdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zt9bdnEeau1vMV3Bsx4w" name="[0..1] expression" sourceNode="_l6ZIMbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zt9bdnEeau1vMV3Bsx4w" name="[0..1] expression" sourceNode="_l6ZIMbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//QuantifiedExpression/expression"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//QuantifiedExpression/expression"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zt9rdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zt97dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zt9rdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zt97dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6Zt-LdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6Zt-LdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zt-bdnEeau1vMV3Bsx4w" name="[0..*] operands" sourceNode="_l6ZIObdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zt-bdnEeau1vMV3Bsx4w" name="[0..*] operands" sourceNode="_l6ZIObdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//And/operands"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//And/operands"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zt-rdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zt-7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zt-rdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zt-7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6Zt_LdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6Zt_LdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zt_bdnEeau1vMV3Bsx4w" name="[0..*] operands" sourceNode="_l6ZIO7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zt_bdnEeau1vMV3Bsx4w" name="[0..*] operands" sourceNode="_l6ZIO7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Or/operands"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Or/operands"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zt_rdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zt_7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zt_rdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zt_7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuALdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuALdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuAbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZIPbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuAbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZIPbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Impl/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Impl/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuArdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuA7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuArdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuA7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuBLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuBLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuBbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZIPbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuBbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZIPbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Impl/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Impl/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuBrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuB7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuBrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuB7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuCLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuCLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuCbdnEeau1vMV3Bsx4w" name="[0..1] operand" sourceNode="_l6ZIP7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuCbdnEeau1vMV3Bsx4w" name="[0..1] operand" sourceNode="_l6ZIP7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Not/operand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Not/operand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuCrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuC7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuCrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuC7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuDLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuDLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuDbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZIQbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuDbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZIQbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Iff/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Iff/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuDrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuD7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuDrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuD7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuELdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuELdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuEbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZIQbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuEbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZIQbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Iff/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Iff/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuErdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuE7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuErdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuE7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuFLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuFLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuFbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZIRbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuFbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZIRbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Equals/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Equals/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuFrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuF7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuFrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuF7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuGLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuGLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuGbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZIRbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuGbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZIRbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Equals/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Equals/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuGrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuG7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuGrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuG7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuHLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuHLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuHbdnEeau1vMV3Bsx4w" name="[0..*] operands" sourceNode="_l6ZIR7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuHbdnEeau1vMV3Bsx4w" name="[0..*] operands" sourceNode="_l6ZIR7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Distinct/operands"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Distinct/operands"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuHrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuH7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuHrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuH7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuILdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuILdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuIbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZISbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuIbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZISbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessThan/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessThan/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuIrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuI7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuIrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuI7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuJLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuJLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuJbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZISbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuJbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZISbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessThan/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessThan/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuJrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuJ7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuJrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuJ7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuKLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuKLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuKbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZIS7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuKbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZIS7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreThan/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreThan/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuKrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuK7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuKrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuK7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuLLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuLLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuLbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZIS7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuLbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZIS7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreThan/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreThan/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuLrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuL7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuLrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuL7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuMLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuMLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuMbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZITbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuMbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZITbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessOrEqualThan/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessOrEqualThan/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuMrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuM7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuMrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuM7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuNLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuNLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuNbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZITbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuNbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZITbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessOrEqualThan/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//LessOrEqualThan/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuNrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuN7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuNrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuN7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuOLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuOLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuObdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZIT7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuObdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZIT7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreOrEqualThan/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreOrEqualThan/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuOrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuO7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuOrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuO7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuPLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuPLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuPbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZIT7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuPbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZIT7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreOrEqualThan/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//MoreOrEqualThan/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuPrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuP7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuPrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuP7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuQLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuQLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuQbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZtwbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
-      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IntOperation/leftOperand"/>
-      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IntOperation/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuQrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuQ7dnEeau1vMV3Bsx4w" showIcon="false">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuQbdnEeau1vMV3Bsx4w" name="[0..1] leftOperand" sourceNode="_l6ZtwbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//NumericOperation/leftOperand"/>
+      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//NumericOperation/leftOperand"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuQrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuQ7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuRLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuRLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuRbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZtwbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
-      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IntOperation/rightOperand"/>
-      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IntOperation/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuRrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuR7dnEeau1vMV3Bsx4w" showIcon="false">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuRbdnEeau1vMV3Bsx4w" name="[0..1] rightOperand" sourceNode="_l6ZtwbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//NumericOperation/rightOperand"/>
+      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//NumericOperation/rightOperand"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuRrdnEeau1vMV3Bsx4w" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuR7dnEeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZuSLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZuSLdnEeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZufbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIGbdnEeau1vMV3Bsx4w" targetNode="_l6Ztz7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZufbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIGbdnEeau1vMV3Bsx4w" targetNode="_l6Ztz7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Term/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZufrdnEeau1vMV3Bsx4w" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZufrdnEeau1vMV3Bsx4w" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuf7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuf7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZugLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZugLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuhbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIH7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuhbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIH7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//SymbolicValue/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuhrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuhrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuh7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuh7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuiLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuiLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuibdnEeau1vMV3Bsx4w" sourceNode="_l6ZIIbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuibdnEeau1vMV3Bsx4w" sourceNode="_l6ZIIbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//AtomicTerm/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuirdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuirdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zui7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zui7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZujLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZujLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZujbdnEeau1vMV3Bsx4w" sourceNode="_l6ZII7dnEeau1vMV3Bsx4w" targetNode="_l6ZIIbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZujbdnEeau1vMV3Bsx4w" sourceNode="_l6ZII7dnEeau1vMV3Bsx4w" targetNode="_l6ZIIbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntLiteral"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//IntLiteral/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZujrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZujrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuj7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuj7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZukLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZukLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZukbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIJ7dnEeau1vMV3Bsx4w" targetNode="_l6ZIIbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZukbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIJ7dnEeau1vMV3Bsx4w" targetNode="_l6ZIIbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolLiteral"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//BoolLiteral/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZukrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZukrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuk7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuk7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZulLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZulLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZulbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIK7dnEeau1vMV3Bsx4w" targetNode="_l6ZIIbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZulbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIK7dnEeau1vMV3Bsx4w" targetNode="_l6ZIIbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealLiteral"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//RealLiteral/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZulrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//RealLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZulrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zul7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zul7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZumLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZumLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZunbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIMbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZunbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIMbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//QuantifiedExpression"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//QuantifiedExpression/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZunrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//QuantifiedExpression"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZunrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zun7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zun7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuoLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuoLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuobdnEeau1vMV3Bsx4w" sourceNode="_l6ZIM7dnEeau1vMV3Bsx4w" targetNode="_l6ZIMbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuobdnEeau1vMV3Bsx4w" sourceNode="_l6ZIM7dnEeau1vMV3Bsx4w" targetNode="_l6ZIMbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Exists"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Exists/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuordnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Exists"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuordnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuo7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuo7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZupLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZupLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZupbdnEeau1vMV3Bsx4w" sourceNode="_l6ZINbdnEeau1vMV3Bsx4w" targetNode="_l6ZIMbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZupbdnEeau1vMV3Bsx4w" sourceNode="_l6ZINbdnEeau1vMV3Bsx4w" targetNode="_l6ZIMbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Forall"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Forall/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuprdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Forall"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuprdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zup7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zup7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuqLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuqLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuqbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIN7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuqbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIN7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolOperation"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//BoolOperation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuqrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//BoolOperation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuqrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuq7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuq7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZurLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZurLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZurbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIObdnEeau1vMV3Bsx4w" targetNode="_l6ZIN7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZurbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIObdnEeau1vMV3Bsx4w" targetNode="_l6ZIN7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//And"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//And/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZurrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//And"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZurrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zur7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zur7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZusLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZusLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZusbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIO7dnEeau1vMV3Bsx4w" targetNode="_l6ZIN7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZusbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIO7dnEeau1vMV3Bsx4w" targetNode="_l6ZIN7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Or"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Or/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZusrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Or"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZusrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zus7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zus7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZutLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZutLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZutbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIPbdnEeau1vMV3Bsx4w" targetNode="_l6ZIN7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZutbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIPbdnEeau1vMV3Bsx4w" targetNode="_l6ZIN7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Impl"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Impl/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZutrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Impl"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZutrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zut7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zut7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuuLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuuLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuubdnEeau1vMV3Bsx4w" sourceNode="_l6ZIP7dnEeau1vMV3Bsx4w" targetNode="_l6ZIN7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuubdnEeau1vMV3Bsx4w" sourceNode="_l6ZIP7dnEeau1vMV3Bsx4w" targetNode="_l6ZIN7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Not"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Not/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuurdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Not"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuurdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuu7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuu7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuvLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuvLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuvbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIQbdnEeau1vMV3Bsx4w" targetNode="_l6ZIN7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuvbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIQbdnEeau1vMV3Bsx4w" targetNode="_l6ZIN7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Iff"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Iff/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuvrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Iff"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuvrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuv7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuv7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuwLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuwLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuwbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIQ7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuwbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIQ7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveRelation"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//PrimitiveRelation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuwrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//PrimitiveRelation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuwrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuw7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuw7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuxLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuxLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuxbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIRbdnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuxbdnEeau1vMV3Bsx4w" sourceNode="_l6ZIRbdnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Equals"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Equals/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuxrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Equals"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuxrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zux7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zux7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuyLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuyLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuybdnEeau1vMV3Bsx4w" sourceNode="_l6ZIR7dnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuybdnEeau1vMV3Bsx4w" sourceNode="_l6ZIR7dnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Distinct"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Distinct/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuyrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Distinct"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuyrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuy7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuy7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZuzLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZuzLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZuzbdnEeau1vMV3Bsx4w" sourceNode="_l6ZISbdnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZuzbdnEeau1vMV3Bsx4w" sourceNode="_l6ZISbdnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessThan"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//LessThan/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZuzrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessThan"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZuzrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zuz7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zuz7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zu0LdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zu0LdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zu0bdnEeau1vMV3Bsx4w" sourceNode="_l6ZIS7dnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zu0bdnEeau1vMV3Bsx4w" sourceNode="_l6ZIS7dnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreThan"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//MoreThan/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zu0rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreThan"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zu0rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zu07dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zu07dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zu1LdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zu1LdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zu1bdnEeau1vMV3Bsx4w" sourceNode="_l6ZITbdnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zu1bdnEeau1vMV3Bsx4w" sourceNode="_l6ZITbdnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessOrEqualThan"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//LessOrEqualThan/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zu1rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//LessOrEqualThan"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zu1rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zu17dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zu17dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zu2LdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zu2LdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zu2bdnEeau1vMV3Bsx4w" sourceNode="_l6ZIT7dnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zu2bdnEeau1vMV3Bsx4w" sourceNode="_l6ZIT7dnEeau1vMV3Bsx4w" targetNode="_l6ZIQ7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreOrEqualThan"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//MoreOrEqualThan/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zu2rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//MoreOrEqualThan"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zu2rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zu27dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zu27dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zu3LdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zu3LdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zu3bdnEeau1vMV3Bsx4w" sourceNode="_l6ZtwbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
-      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IntOperation"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//IntOperation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zu3rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zu3bdnEeau1vMV3Bsx4w" sourceNode="_l6ZtwbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//NumericOperation"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//NumericOperation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zu3rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zu37dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zu37dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zu4LdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zu4LdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zu4bdnEeau1vMV3Bsx4w" sourceNode="_l6Ztw7dnEeau1vMV3Bsx4w" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zu4bdnEeau1vMV3Bsx4w" sourceNode="_l6Ztw7dnEeau1vMV3Bsx4w" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Plus"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Plus/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zu4rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Plus"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zu4rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zu47dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zu47dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zu5LdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zu5LdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zu5bdnEeau1vMV3Bsx4w" sourceNode="_l6ZtxbdnEeau1vMV3Bsx4w" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zu5bdnEeau1vMV3Bsx4w" sourceNode="_l6ZtxbdnEeau1vMV3Bsx4w" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Minus"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Minus/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zu5rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Minus"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zu5rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zu57dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zu57dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zu6LdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zu6LdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zu6bdnEeau1vMV3Bsx4w" sourceNode="_l6Ztx7dnEeau1vMV3Bsx4w" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zu6bdnEeau1vMV3Bsx4w" sourceNode="_l6Ztx7dnEeau1vMV3Bsx4w" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Multiply"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Multiply/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zu6rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Multiply"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zu6rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zu67dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zu67dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zu7LdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zu7LdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zu7bdnEeau1vMV3Bsx4w" sourceNode="_l6ZtybdnEeau1vMV3Bsx4w" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zu7bdnEeau1vMV3Bsx4w" sourceNode="_l6ZtybdnEeau1vMV3Bsx4w" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Divison"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Divison/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zu7rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Divison"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zu7rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zu77dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zu77dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zu8LdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zu8LdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6Zu8bdnEeau1vMV3Bsx4w" sourceNode="_l6Zty7dnEeau1vMV3Bsx4w" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6Zu8bdnEeau1vMV3Bsx4w" sourceNode="_l6Zty7dnEeau1vMV3Bsx4w" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Mod"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Mod/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6Zu8rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Mod"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6Zu8rdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6Zu87dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6Zu87dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6Zu9LdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6Zu9LdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZvG7dnEeau1vMV3Bsx4w" name="IfThenElse" tooltipText="" outgoingEdges="_l6ZvHbdnEeau1vMV3Bsx4w _l6ZvIbdnEeau1vMV3Bsx4w _l6ZvJbdnEeau1vMV3Bsx4w _l6ZvKbdnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZvG7dnEeau1vMV3Bsx4w" name="IfThenElse" tooltipText="" outgoingEdges="_l6ZvHbdnEeau1vMV3Bsx4w _l6ZvIbdnEeau1vMV3Bsx4w _l6ZvJbdnEeau1vMV3Bsx4w _l6ZvKbdnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZvHLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZvHLdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZvHbdnEeau1vMV3Bsx4w" name="[1..1] condition" sourceNode="_l6ZvG7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZvHbdnEeau1vMV3Bsx4w" name="[1..1] condition" sourceNode="_l6ZvG7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/condition"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/condition"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZvHrdnEeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZvH7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZvHrdnEeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZvH7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZvILdnEeau1vMV3Bsx4w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZvILdnEeau1vMV3Bsx4w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZvIbdnEeau1vMV3Bsx4w" sourceNode="_l6ZvG7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZvIbdnEeau1vMV3Bsx4w" sourceNode="_l6ZvG7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//IfThenElse/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZvIrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//IfThenElse"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZvIrdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6ZvI7dnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6ZvI7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZvJLdnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZvJLdnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZvJbdnEeau1vMV3Bsx4w" name="[1..1] ifTrue" sourceNode="_l6ZvG7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZvJbdnEeau1vMV3Bsx4w" name="[1..1] ifTrue" sourceNode="_l6ZvG7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifTrue"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifTrue"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZvJrdnEeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZvJ7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZvJrdnEeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZvJ7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZvKLdnEeau1vMV3Bsx4w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZvKLdnEeau1vMV3Bsx4w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZvKbdnEeau1vMV3Bsx4w" name="[1..1] ifFalse" sourceNode="_l6ZvG7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZvKbdnEeau1vMV3Bsx4w" name="[1..1] ifFalse" sourceNode="_l6ZvG7dnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifFalse"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//IfThenElse/ifFalse"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZvKrdnEeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZvK7dnEeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZvKrdnEeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZvK7dnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_l6ZvLLdnEeau1vMV3Bsx4w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_l6ZvLLdnEeau1vMV3Bsx4w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZvZbdnEeau1vMV3Bsx4w" name="UnknownBecauseUninterpreted" tooltipText="" outgoingEdges="_l6ZvZ7dnEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_l6ZvZbdnEeau1vMV3Bsx4w" name="UnknownBecauseUninterpreted" tooltipText="" outgoingEdges="_l6ZvZ7dnEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//UnknownBecauseUninterpreted"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//UnknownBecauseUninterpreted"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZvZrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l6ZvZrdnEeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_l6ZvZ7dnEeau1vMV3Bsx4w" sourceNode="_l6ZvZbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l6ZvZ7dnEeau1vMV3Bsx4w" sourceNode="_l6ZvZbdnEeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//UnknownBecauseUninterpreted"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//UnknownBecauseUninterpreted/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_l6ZvaLdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//UnknownBecauseUninterpreted"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l6ZvaLdnEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_l6ZvabdnEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l6ZvabdnEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_l6ZvardnEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l6ZvardnEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_YtYxgLd1Eeau1vMV3Bsx4w" name="InstanceOf" tooltipText="" outgoingEdges="_kQZhsLd1Eeau1vMV3Bsx4w _LsuTYLd8Eeau1vMV3Bsx4w _BoaVwLqxEeau1vMV3Bsx4w" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_YtYxgLd1Eeau1vMV3Bsx4w" name="InstanceOf" tooltipText="" outgoingEdges="_kQZhsLd1Eeau1vMV3Bsx4w _LsuTYLd8Eeau1vMV3Bsx4w _BoaVwLqxEeau1vMV3Bsx4w" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//InstanceOf"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//InstanceOf"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_YtZ_oLd1Eeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_YtZ_oLd1Eeau1vMV3Bsx4w" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_kQZhsLd1Eeau1vMV3Bsx4w" name="[1..1] value" sourceNode="_YtYxgLd1Eeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_kQZhsLd1Eeau1vMV3Bsx4w" name="[1..1] value" sourceNode="_YtYxgLd1Eeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//InstanceOf/value"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//InstanceOf/value"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_mdcoELd1Eeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_mdcoEbd1Eeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_mdcoELd1Eeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_mdcoEbd1Eeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_mdcoErd1Eeau1vMV3Bsx4w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_mdcoErd1Eeau1vMV3Bsx4w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_JfJBgLd8Eeau1vMV3Bsx4w" name="TypeReference" tooltipText="" incomingEdges="_JfkfULd8Eeau1vMV3Bsx4w _LsuTYLd8Eeau1vMV3Bsx4w _hS4pcIKhEeeAppuRs-roLg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_JfJBgLd8Eeau1vMV3Bsx4w" name="TypeReference" tooltipText="" incomingEdges="_JfkfULd8Eeau1vMV3Bsx4w _LsuTYLd8Eeau1vMV3Bsx4w _hS4pcIKhEeeAppuRs-roLg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_JfJokLd8Eeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_JfJokLd8Eeau1vMV3Bsx4w" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_JfkfULd8Eeau1vMV3Bsx4w" name="[1..1] range" sourceNode="_l6ZIL7dnEeau1vMV3Bsx4w" targetNode="_JfJBgLd8Eeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_JfkfULd8Eeau1vMV3Bsx4w" name="[1..1] range" sourceNode="_l6ZIL7dnEeau1vMV3Bsx4w" targetNode="_JfJBgLd8Eeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Variable/range"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Variable/range"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_JfkfUbd8Eeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_JfkfUrd8Eeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_JfkfUbd8Eeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_JfkfUrd8Eeau1vMV3Bsx4w" showIcon="false">
           <customFeatures>labelSize</customFeatures>
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_JfkfU7d8Eeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_JfkfU7d8Eeau1vMV3Bsx4w" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_LsuTYLd8Eeau1vMV3Bsx4w" name="[1..1] range" sourceNode="_YtYxgLd1Eeau1vMV3Bsx4w" targetNode="_JfJBgLd8Eeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_LsuTYLd8Eeau1vMV3Bsx4w" name="[1..1] range" sourceNode="_YtYxgLd1Eeau1vMV3Bsx4w" targetNode="_JfJBgLd8Eeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//InstanceOf/range"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//InstanceOf/range"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_NfNksLd8Eeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_NfNksbd8Eeau1vMV3Bsx4w" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_NfNksLd8Eeau1vMV3Bsx4w" description="_l6XRh7dnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_NfNksbd8Eeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>bold</labelFormat>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_NfNksrd8Eeau1vMV3Bsx4w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_NfNksrd8Eeau1vMV3Bsx4w" labelSize="6" showIcon="false" labelColor="39,76,114"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_BoaVwLqxEeau1vMV3Bsx4w" sourceNode="_YtYxgLd1Eeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_BoaVwLqxEeau1vMV3Bsx4w" sourceNode="_YtYxgLd1Eeau1vMV3Bsx4w" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//InstanceOf"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//InstanceOf/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Boa80LqxEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//InstanceOf"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Boa80LqxEeau1vMV3Bsx4w" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_Boa80bqxEeau1vMV3Bsx4w" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Boa80bqxEeau1vMV3Bsx4w" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Boa80rqxEeau1vMV3Bsx4w" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Boa80rqxEeau1vMV3Bsx4w" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_XgmiUHuWEeeCn_RNMwgEBg" name="StringLiteral" tooltipText="" outgoingEdges="_zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_XgmiUHuWEeeCn_RNMwgEBg" name="StringLiteral" tooltipText="" outgoingEdges="_zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fCIaEHuWEeeCn_RNMwgEBg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_fCIaEHuWEeeCn_RNMwgEBg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_bsTGsHuWEeeCn_RNMwgEBg" name="value : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_bsTGsHuWEeeCn_RNMwgEBg" name="value : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//StringLiteral/value"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//StringLiteral/value"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fCTZMHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_fCTZMHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_zEk0sHuWEeeCn_RNMwgEBg" sourceNode="_XgmiUHuWEeeCn_RNMwgEBg" targetNode="_l6ZIIbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_zEk0sHuWEeeCn_RNMwgEBg" sourceNode="_XgmiUHuWEeeCn_RNMwgEBg" targetNode="_l6ZIIbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//StringLiteral/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_zEmC0HuWEeeCn_RNMwgEBg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_zEmC0HuWEeeCn_RNMwgEBg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_zEmC0XuWEeeCn_RNMwgEBg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_zEmC0XuWEeeCn_RNMwgEBg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_zEmC0nuWEeeCn_RNMwgEBg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_zEmC0nuWEeeCn_RNMwgEBg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_PQURUIKgEeeAppuRs-roLg" name="TransitiveClosure" tooltipText="" outgoingEdges="_Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg _mNGgsIKhEeeAppuRs-roLg _sGSk0IKlEeeAppuRs-roLg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_PQURUIKgEeeAppuRs-roLg" name="TransitiveClosure" tooltipText="" outgoingEdges="_Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg _mNGgsIKhEeeAppuRs-roLg _sGSk0IKlEeeAppuRs-roLg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_PQdbQIKgEeeAppuRs-roLg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_PQdbQIKgEeeAppuRs-roLg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Vi5psIKgEeeAppuRs-roLg" name="[0..1] leftOperand" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Vi5psIKgEeeAppuRs-roLg" name="[0..1] leftOperand" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/leftOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/leftOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Vi5psYKgEeeAppuRs-roLg" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Vi5psoKgEeeAppuRs-roLg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Vi5psYKgEeeAppuRs-roLg" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Vi5psoKgEeeAppuRs-roLg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_Vi5ps4KgEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_Vi5ps4KgEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_YRIxkIKgEeeAppuRs-roLg" name="[0..1] rightOperand" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_YRIxkIKgEeeAppuRs-roLg" name="[0..1] rightOperand" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/rightOperand"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/rightOperand"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_YRIxkYKgEeeAppuRs-roLg" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_YRIxkoKgEeeAppuRs-roLg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_YRIxkYKgEeeAppuRs-roLg" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_YRIxkoKgEeeAppuRs-roLg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_YRIxk4KgEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YRIxk4KgEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_e0z58IKgEeeAppuRs-roLg" name="SymbolicDeclaration" tooltipText="" outgoingEdges="_e1jg1IKgEeeAppuRs-roLg" incomingEdges="_e1Zv0IKgEeeAppuRs-roLg _e1jg0IKgEeeAppuRs-roLg _hTMLcIKhEeeAppuRs-roLg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_e0z58IKgEeeAppuRs-roLg" name="SymbolicDeclaration" tooltipText="" outgoingEdges="_e1jg1IKgEeeAppuRs-roLg" incomingEdges="_e1Zv0IKgEeeAppuRs-roLg _e1jg0IKgEeeAppuRs-roLg _hTMLcIKhEeeAppuRs-roLg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_e0z58YKgEeeAppuRs-roLg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_e0z58YKgEeeAppuRs-roLg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_e1Ql4IKgEeeAppuRs-roLg" name="name : EString" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_e1Ql4IKgEeeAppuRs-roLg" name="name : EString" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//SymbolicDeclaration/name"/>
         <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//SymbolicDeclaration/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_e1Ql4YKgEeeAppuRs-roLg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_e1Ql4YKgEeeAppuRs-roLg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
           <labelFormat>bold</labelFormat>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_e1Zv0IKgEeeAppuRs-roLg" name="[0..1] symbolicReference" sourceNode="_l6ZIH7dnEeau1vMV3Bsx4w" targetNode="_e0z58IKgEeeAppuRs-roLg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_e1Zv0IKgEeeAppuRs-roLg" name="[0..1] symbolicReference" sourceNode="_l6ZIH7dnEeau1vMV3Bsx4w" targetNode="_e0z58IKgEeeAppuRs-roLg">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_e1Zv0YKgEeeAppuRs-roLg" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_e1Zv0YKgEeeAppuRs-roLg" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_e1Zv0oKgEeeAppuRs-roLg" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_e1Zv0oKgEeeAppuRs-roLg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_e1Zv04KgEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_e1Zv04KgEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_e1jg0IKgEeeAppuRs-roLg" sourceNode="_l6ZIL7dnEeau1vMV3Bsx4w" targetNode="_e0z58IKgEeeAppuRs-roLg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_e1jg0IKgEeeAppuRs-roLg" sourceNode="_l6ZIL7dnEeau1vMV3Bsx4w" targetNode="_e0z58IKgEeeAppuRs-roLg">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Variable/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_e1jg0YKgEeeAppuRs-roLg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_e1jg0YKgEeeAppuRs-roLg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_e1jg0oKgEeeAppuRs-roLg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_e1jg0oKgEeeAppuRs-roLg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_e1jg04KgEeeAppuRs-roLg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_e1jg04KgEeeAppuRs-roLg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_e1jg1IKgEeeAppuRs-roLg" sourceNode="_e0z58IKgEeeAppuRs-roLg" targetNode="_l6Ztz7dnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_e1jg1IKgEeeAppuRs-roLg" sourceNode="_e0z58IKgEeeAppuRs-roLg" targetNode="_l6Ztz7dnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//SymbolicDeclaration/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_e1jg1YKgEeeAppuRs-roLg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_e1jg1YKgEeeAppuRs-roLg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_e1jg1oKgEeeAppuRs-roLg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_e1jg1oKgEeeAppuRs-roLg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_e1jg14KgEeeAppuRs-roLg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_e1jg14KgEeeAppuRs-roLg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_hSSzkIKhEeeAppuRs-roLg" name="Relation" tooltipText="" outgoingEdges="_hS4pcIKhEeeAppuRs-roLg _hTMLcIKhEeeAppuRs-roLg" incomingEdges="_mNGgsIKhEeeAppuRs-roLg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_hSSzkIKhEeeAppuRs-roLg" name="Relation" tooltipText="" outgoingEdges="_hS4pcIKhEeeAppuRs-roLg _hTMLcIKhEeeAppuRs-roLg" incomingEdges="_mNGgsIKhEeeAppuRs-roLg _hJ8ymW6cEemSyfDlsGAqLA" width="12" height="10">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
       <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hSSzkYKhEeeAppuRs-roLg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_hSSzkYKhEeeAppuRs-roLg" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
         <labelFormat>italic</labelFormat>
         <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_hSvfgIKhEeeAppuRs-roLg" name=" annotations : RelationAnnotation" tooltipText="">
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_hSvfgIKhEeeAppuRs-roLg" name=" annotations : RelationAnnotation" tooltipText="">
         <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/annotations"/>
         <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/annotations"/>
-        <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_hSvfgYKhEeeAppuRs-roLg" labelAlignment="LEFT" color="114,159,207">
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_hSvfgYKhEeeAppuRs-roLg" labelAlignment="LEFT" color="114,159,207">
           <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/>
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_hS4pcIKhEeeAppuRs-roLg" name="[0..*] parameters" sourceNode="_hSSzkIKhEeeAppuRs-roLg" targetNode="_JfJBgLd8Eeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_hS4pcIKhEeeAppuRs-roLg" name="[0..*] parameters" sourceNode="_hSSzkIKhEeeAppuRs-roLg" targetNode="_JfJBgLd8Eeau1vMV3Bsx4w">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/parameters"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/parameters"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_hS4pcYKhEeeAppuRs-roLg" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_hS4pcoKhEeeAppuRs-roLg" showIcon="false">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_hS4pcYKhEeeAppuRs-roLg" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_hS4pcoKhEeeAppuRs-roLg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_hS4pc4KhEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_hS4pc4KhEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_hTMLcIKhEeeAppuRs-roLg" sourceNode="_hSSzkIKhEeeAppuRs-roLg" targetNode="_e0z58IKgEeeAppuRs-roLg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_hTMLcIKhEeeAppuRs-roLg" sourceNode="_hSSzkIKhEeeAppuRs-roLg" targetNode="_e0z58IKgEeeAppuRs-roLg">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Relation/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_hTMLcYKhEeeAppuRs-roLg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_hTMLcYKhEeeAppuRs-roLg" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_hTMLcoKhEeeAppuRs-roLg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_hTMLcoKhEeeAppuRs-roLg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_hTMLc4KhEeeAppuRs-roLg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_hTMLc4KhEeeAppuRs-roLg" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_mNGgsIKhEeeAppuRs-roLg" name="[0..1] relation" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_hSSzkIKhEeeAppuRs-roLg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_mNGgsIKhEeeAppuRs-roLg" name="[0..1] relation" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_hSSzkIKhEeeAppuRs-roLg">
       <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/relation"/>
       <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/relation"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_mNGgsYKhEeeAppuRs-roLg" routingStyle="manhattan" strokeColor="0,0,0">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_mNGgsYKhEeeAppuRs-roLg" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_mNGgsoKhEeeAppuRs-roLg" showIcon="false">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_mNGgsoKhEeeAppuRs-roLg" showIcon="false">
           <customFeatures>labelSize</customFeatures>
         </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_mNGgs4KhEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_mNGgs4KhEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
           <customFeatures>labelSize</customFeatures>
         </endLabelStyle>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_sGSk0IKlEeeAppuRs-roLg" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sGSk0IKlEeeAppuRs-roLg" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
       <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/>
-      <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//TransitiveClosure/@eGenericSuperTypes.0"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_sGSk0YKlEeeAppuRs-roLg" targetArrow="InputClosedArrow" routingStyle="tree">
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sGSk0YKlEeeAppuRs-roLg" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_sGSk0oKlEeeAppuRs-roLg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sGSk04KlEeeAppuRs-roLg" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_JAggoG6MEemSyfDlsGAqLA" name="Pow" tooltipText="" outgoingEdges="_OC7Rpm6MEemSyfDlsGAqLA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Pow"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Pow"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_JAhHsG6MEemSyfDlsGAqLA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OC7Rpm6MEemSyfDlsGAqLA" sourceNode="_JAggoG6MEemSyfDlsGAqLA" targetNode="_l6ZtwbdnEeau1vMV3Bsx4w">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Pow"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Pow"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OC74sG6MEemSyfDlsGAqLA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OC74sW6MEemSyfDlsGAqLA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OC74sm6MEemSyfDlsGAqLA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_rrY_wG6WEemSyfDlsGAqLA" name="AggregateExpression" tooltipText="" outgoingEdges="_za0wsm6WEemSyfDlsGAqLA _hJ8ymW6cEemSyfDlsGAqLA" incomingEdges="_wovb6G6cEemSyfDlsGAqLA _OKfpkm6dEemSyfDlsGAqLA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AggregateExpression"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//AggregateExpression"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_yJ0bw26WEemSyfDlsGAqLA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_za0wsm6WEemSyfDlsGAqLA" sourceNode="_rrY_wG6WEemSyfDlsGAqLA" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AggregateExpression"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//AggregateExpression"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_za1XsG6WEemSyfDlsGAqLA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_za1XsW6WEemSyfDlsGAqLA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_za1Xsm6WEemSyfDlsGAqLA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_309kMG6XEemSyfDlsGAqLA" name="Sum" tooltipText="" outgoingEdges="_Op-a0G6dEemSyfDlsGAqLA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Sum"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Sum"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_30-LQG6XEemSyfDlsGAqLA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_52k2oG6XEemSyfDlsGAqLA" name="Count" tooltipText="" outgoingEdges="_wovb6G6cEemSyfDlsGAqLA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Count"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Count"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_52ldsG6XEemSyfDlsGAqLA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_8mxtYG6XEemSyfDlsGAqLA" name="Min" tooltipText="" outgoingEdges="_PALUXG6dEemSyfDlsGAqLA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Min"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Min"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_8myUcG6XEemSyfDlsGAqLA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_-vAlMG6XEemSyfDlsGAqLA" name="Max" tooltipText="" outgoingEdges="_PRtwRm6dEemSyfDlsGAqLA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Max"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Max"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_-vAlMW6XEemSyfDlsGAqLA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_hJ8ymW6cEemSyfDlsGAqLA" name="[0..1] relation" sourceNode="_rrY_wG6WEemSyfDlsGAqLA" targetNode="_hSSzkIKhEeeAppuRs-roLg">
+      <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//AggregateExpression/relation"/>
+      <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//AggregateExpression/relation"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_hJ9ZoG6cEemSyfDlsGAqLA" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_hJ9Zom6cEemSyfDlsGAqLA" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_hJ9ZoW6cEemSyfDlsGAqLA" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_wovb6G6cEemSyfDlsGAqLA" sourceNode="_52k2oG6XEemSyfDlsGAqLA" targetNode="_rrY_wG6WEemSyfDlsGAqLA">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Count"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Count"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_wowC4G6cEemSyfDlsGAqLA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_wowC4W6cEemSyfDlsGAqLA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_wowC4m6cEemSyfDlsGAqLA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_9J4BIG6cEemSyfDlsGAqLA" name="ProjectedAggregateExpression" tooltipText="" outgoingEdges="_OKfpkm6dEemSyfDlsGAqLA" incomingEdges="_Op-a0G6dEemSyfDlsGAqLA _PALUXG6dEemSyfDlsGAqLA _PRtwRm6dEemSyfDlsGAqLA" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ProjectedAggregateExpression"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ProjectedAggregateExpression"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_h3rznG6iEemSyfDlsGAqLA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ZWWd8G6dEemSyfDlsGAqLA" name="projectionIndex : EInt = -1" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//ProjectedAggregateExpression/projectionIndex"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//ProjectedAggregateExpression/projectionIndex"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_hYwOIW6dEemSyfDlsGAqLA" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OKfpkm6dEemSyfDlsGAqLA" sourceNode="_9J4BIG6cEemSyfDlsGAqLA" targetNode="_rrY_wG6WEemSyfDlsGAqLA">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//ProjectedAggregateExpression"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//ProjectedAggregateExpression"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_hZDJE26dEemSyfDlsGAqLA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_hZDJFG6dEemSyfDlsGAqLA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_hZDJFW6dEemSyfDlsGAqLA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Op-a0G6dEemSyfDlsGAqLA" sourceNode="_309kMG6XEemSyfDlsGAqLA" targetNode="_9J4BIG6cEemSyfDlsGAqLA">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Sum"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Sum"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Op-a0W6dEemSyfDlsGAqLA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Op-a0m6dEemSyfDlsGAqLA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Op-a026dEemSyfDlsGAqLA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_PALUXG6dEemSyfDlsGAqLA" sourceNode="_8mxtYG6XEemSyfDlsGAqLA" targetNode="_9J4BIG6cEemSyfDlsGAqLA">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Min"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Min"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_PALUXW6dEemSyfDlsGAqLA" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_PALUXm6dEemSyfDlsGAqLA" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_PALUX26dEemSyfDlsGAqLA" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_PRtwRm6dEemSyfDlsGAqLA" sourceNode="_-vAlMG6XEemSyfDlsGAqLA" targetNode="_9J4BIG6cEemSyfDlsGAqLA">
+      <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Max"/>
+      <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Max"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_PRtwR26dEemSyfDlsGAqLA" targetArrow="InputClosedArrow" routingStyle="tree">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_sGSk0oKlEeeAppuRs-roLg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_PRtwSG6dEemSyfDlsGAqLA" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_sGSk04KlEeeAppuRs-roLg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_PRtwSW6dEemSyfDlsGAqLA" showIcon="false"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_l6Zva7dnEeau1vMV3Bsx4w"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_l6Zva7dnEeau1vMV3Bsx4w"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
     <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
-- 
cgit v1.2.3-54-g00ecf