diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps
index f073b1f4af8..4161f0bfbc1 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram.sandbox/languageModels/structure.mps
@@ -306,8 +306,8 @@
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4eKbpy7VDkg" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkh" role="3wpmZR">
-                <property role="2Vclpx" value="-420.5" />
-                <property role="2Vclpz" value="-22.5" />
+                <property role="2Vclpx" value="-344.5" />
+                <property role="2Vclpz" value="-16.5" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDki" role="3wpmZP">
                 <property role="2Vclpx" value="579.5" />
@@ -316,12 +316,12 @@
             </node>
           </node>
           <node concept="2VclrF" id="4eKbpy7VDii" role="2Vcluh">
-            <property role="2Vclpx" value="166.22937901341763" />
-            <property role="2Vclpz" value="129.0" />
+            <property role="2Vclpx" value="287.0" />
+            <property role="2Vclpz" value="114.0" />
           </node>
           <node concept="2VclrF" id="4eKbpy7VDij" role="2Vcluh">
-            <property role="2Vclpx" value="211.0" />
-            <property role="2Vclpz" value="129.0" />
+            <property role="2Vclpx" value="214.0" />
+            <property role="2Vclpz" value="114.0" />
           </node>
           <node concept="3ul5H1" id="4AXwGoMCJYs" role="3ul5Gx">
             <property role="3ul5GH" value="startRole" />
@@ -367,8 +367,8 @@
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4eKbpy7VDkj" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkk" role="3wpmZR">
-                <property role="2Vclpx" value="-805.2066791244449" />
-                <property role="2Vclpz" value="-106.5" />
+                <property role="2Vclpx" value="-860.5" />
+                <property role="2Vclpz" value="-100.5" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDkl" role="3wpmZP">
                 <property role="2Vclpx" value="860.5" />
@@ -376,14 +376,6 @@
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="4AXwGoMCJY$" role="2Vcluh">
-            <property role="2Vclpx" value="166.22937901341763" />
-            <property role="2Vclpz" value="129.0" />
-          </node>
-          <node concept="2VclrF" id="4AXwGoMCJY_" role="2Vcluh">
-            <property role="2Vclpx" value="107.29332087555514" />
-            <property role="2Vclpz" value="129.0" />
-          </node>
           <node concept="3ul5H1" id="4AXwGoMCJYC" role="3ul5Gx">
             <property role="3ul5GH" value="startRole" />
             <node concept="3wpmZ1" id="4AXwGoMCJYD" role="3ul5Gz">
@@ -410,13 +402,13 @@
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="1FnP670fuvh" role="2Vcluh">
-            <property role="2Vclpx" value="107.29332087555514" />
-            <property role="2Vclpz" value="108.0" />
+          <node concept="2VclrF" id="6O6KyRoyamk" role="2Vcluh">
+            <property role="2Vclpx" value="287.0" />
+            <property role="2Vclpz" value="155.0" />
           </node>
-          <node concept="2VclrF" id="1FnP670fuvi" role="2Vcluh">
-            <property role="2Vclpx" value="49.0" />
-            <property role="2Vclpz" value="108.0" />
+          <node concept="2VclrF" id="6O6KyRoyaml" role="2Vcluh">
+            <property role="2Vclpx" value="52.0" />
+            <property role="2Vclpz" value="155.0" />
           </node>
         </node>
       </node>
@@ -738,10 +730,10 @@
       <node concept="37mRIm" id="6vp$_2v0JnK" role="37mRID">
         <property role="37mO49" value="7483173130815597950" />
         <node concept="gqqVs" id="6vp$_2v0JnJ" role="37mO4d">
-          <property role="gqqTZ" value="78.828919053171" />
-          <property role="gqqTW" value="434.0" />
-          <property role="gqqTX" value="84.0" />
-          <property role="gqqTy" value="84.0" />
+          <property role="gqqTZ" value="172.0" />
+          <property role="gqqTW" value="456.0" />
+          <property role="gqqTX" value="82.0" />
+          <property role="gqqTy" value="47.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4AXwGoMCKiY" role="1pap1a">
             <property role="1pa3iD" value="extensions" />
@@ -753,21 +745,21 @@
           </node>
           <node concept="1pa3jb" id="4AXwGoMCKj0" role="1pap1a">
             <property role="1pa3iD" value="link0" />
-            <property role="2gRgW$" value="1406090482" />
+            <property role="2gRgW$" value="1643482382" />
           </node>
           <node concept="1pa3jb" id="4AXwGoMCKj1" role="1pap1a">
             <property role="1pa3iD" value="link1" />
-            <property role="2gRgW$" value="1815134986" />
+            <property role="2gRgW$" value="2147483646" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="6vp$_2v0JnM" role="37mRID">
         <property role="37mO49" value="7483173130815597955" />
         <node concept="gqqVs" id="6vp$_2v0JnL" role="37mO4d">
-          <property role="gqqTZ" value="128.22937901341763" />
-          <property role="gqqTW" value="141.0" />
-          <property role="gqqTX" value="78.0" />
-          <property role="gqqTy" value="84.0" />
+          <property role="gqqTZ" value="248.0" />
+          <property role="gqqTW" value="174.0" />
+          <property role="gqqTX" value="76.0" />
+          <property role="gqqTy" value="47.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4AXwGoMCKj2" role="1pap1a">
             <property role="1pa3iD" value="extensions" />
@@ -779,21 +771,21 @@
           </node>
           <node concept="1pa3jb" id="4AXwGoMCKj4" role="1pap1a">
             <property role="1pa3iD" value="link0" />
-            <property role="2gRgW$" value="1815134986" />
+            <property role="2gRgW$" value="2147483646" />
           </node>
           <node concept="1pa3jb" id="4AXwGoMCKj5" role="1pap1a">
             <property role="1pa3iD" value="linkInput0" />
-            <property role="2gRgW$" value="1406090482" />
+            <property role="2gRgW$" value="1643482382" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="6vp$_2v0JnO" role="37mRID">
         <property role="37mO49" value="7483173130815597958" />
         <node concept="gqqVs" id="6vp$_2v0JnN" role="37mO4d">
-          <property role="gqqTZ" value="121.35446936202209" />
-          <property role="gqqTW" value="305.0" />
-          <property role="gqqTX" value="140.0" />
-          <property role="gqqTy" value="84.0" />
+          <property role="gqqTZ" value="217.0" />
+          <property role="gqqTW" value="301.0" />
+          <property role="gqqTX" value="138.0" />
+          <property role="gqqTy" value="70.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4AXwGoMCKj6" role="1pap1a">
             <property role="1pa3iD" value="extensions" />
@@ -805,21 +797,21 @@
           </node>
           <node concept="1pa3jb" id="4AXwGoMCKj8" role="1pap1a">
             <property role="1pa3iD" value="link0" />
-            <property role="2gRgW$" value="1815134986" />
+            <property role="2gRgW$" value="1938700513" />
           </node>
           <node concept="1pa3jb" id="4AXwGoMCKj9" role="1pap1a">
             <property role="1pa3iD" value="linkInput0" />
-            <property role="2gRgW$" value="1406090482" />
+            <property role="2gRgW$" value="1461481925" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="6vp$_2v0JnQ" role="37mRID">
         <property role="37mO49" value="7483173130815597961" />
         <node concept="gqqVs" id="6vp$_2v0JnP" role="37mO4d">
-          <property role="gqqTZ" value="118.0" />
+          <property role="gqqTZ" value="120.0" />
           <property role="gqqTW" value="12.0" />
-          <property role="gqqTX" value="188.0" />
-          <property role="gqqTy" value="84.0" />
+          <property role="gqqTX" value="186.0" />
+          <property role="gqqTy" value="70.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4AXwGoMCKja" role="1pap1a">
             <property role="1pa3iD" value="extensions" />
@@ -831,21 +823,21 @@
           </node>
           <node concept="1pa3jb" id="4AXwGoMCKjc" role="1pap1a">
             <property role="1pa3iD" value="linkInput0" />
-            <property role="2gRgW$" value="1815134986" />
+            <property role="2gRgW$" value="1938700513" />
           </node>
           <node concept="1pa3jb" id="4AXwGoMCKjd" role="1pap1a">
             <property role="1pa3iD" value="linkInput1" />
-            <property role="2gRgW$" value="1406090482" />
+            <property role="2gRgW$" value="1461481925" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="6vp$_2v0JnS" role="37mRID">
         <property role="37mO49" value="7483173130815597962" />
         <node concept="gqqVs" id="6vp$_2v0JnR" role="37mO4d">
-          <property role="gqqTZ" value="0.0" />
-          <property role="gqqTW" value="30.0" />
-          <property role="gqqTX" value="100.0" />
-          <property role="gqqTy" value="49.0" />
+          <property role="gqqTZ" value="2.0" />
+          <property role="gqqTW" value="16.0" />
+          <property role="gqqTX" value="98.0" />
+          <property role="gqqTy" value="47.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4AXwGoMCKje" role="1pap1a">
             <property role="1pa3iD" value="extensions" />
@@ -861,19 +853,19 @@
         <property role="37mO49" value="7483173130815597953" />
         <node concept="2VclpC" id="6vp$_2v0Jo2" role="37mO4d">
           <node concept="2VclrF" id="6vp$_2v0Jo4" role="2Vcluh">
-            <property role="2Vclpx" value="280.43065342523875" />
-            <property role="2Vclpz" value="460.0" />
+            <property role="2Vclpx" value="409.0" />
+            <property role="2Vclpz" value="469.0" />
           </node>
           <node concept="2VclrF" id="6vp$_2v0Jo5" role="2Vcluh">
-            <property role="2Vclpx" value="280.43065342523875" />
-            <property role="2Vclpz" value="401.0" />
+            <property role="2Vclpx" value="409.0" />
+            <property role="2Vclpz" value="325.5" />
           </node>
           <node concept="3ul5H1" id="6vp$_2v0Jo8" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4eKbpy7VDkm" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkn" role="3wpmZR">
-                <property role="2Vclpx" value="-129.5443526782779" />
-                <property role="2Vclpz" value="-275.0" />
+                <property role="2Vclpx" value="-0.9750061035166482" />
+                <property role="2Vclpz" value="-273.0" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDko" role="3wpmZP">
                 <property role="2Vclpx" value="420.97500610351665" />
@@ -885,8 +877,8 @@
             <property role="3ul5GH" value="endRole" />
             <node concept="3wpmZ1" id="4eKbpy7VDkp" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkq" role="3wpmZR">
-                <property role="2Vclpx" value="-110.16024926373933" />
-                <property role="2Vclpz" value="-228.5" />
+                <property role="2Vclpx" value="-14.514718625761418" />
+                <property role="2Vclpz" value="-234.0" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDkr" role="3wpmZP">
                 <property role="2Vclpx" value="391.5147186257614" />
@@ -907,33 +899,25 @@
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="1FnP670fuvj" role="2Vcluh">
-            <property role="2Vclpx" value="313.35446936202214" />
-            <property role="2Vclpz" value="401.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670fuvk" role="2Vcluh">
-            <property role="2Vclpx" value="313.35446936202214" />
-            <property role="2Vclpz" value="331.0" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="6vp$_2v0Joh" role="37mRID">
         <property role="37mO49" value="7483173130815597954" />
         <node concept="2VclpC" id="6vp$_2v0Jog" role="37mO4d">
           <node concept="2VclrF" id="6vp$_2v0Joi" role="2Vcluh">
-            <property role="2Vclpx" value="417.39851040299436" />
-            <property role="2Vclpz" value="492.0" />
+            <property role="2Vclpx" value="530.0" />
+            <property role="2Vclpz" value="488.0" />
           </node>
           <node concept="2VclrF" id="6vp$_2v0Joj" role="2Vcluh">
-            <property role="2Vclpx" value="417.39851040299436" />
-            <property role="2Vclpz" value="411.5" />
+            <property role="2Vclpx" value="530.0" />
+            <property role="2Vclpz" value="413.5" />
           </node>
           <node concept="3ul5H1" id="6vp$_2v0Jok" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4eKbpy7VDks" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkt" role="3wpmZR">
-                <property role="2Vclpx" value="-191.60148959700564" />
-                <property role="2Vclpz" value="-193.02499389648483" />
+                <property role="2Vclpx" value="-79.0" />
+                <property role="2Vclpz" value="-204.02499389648483" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDku" role="3wpmZP">
                 <property role="2Vclpx" value="620.0" />
@@ -945,8 +929,8 @@
             <property role="3ul5GH" value="endRole" />
             <node concept="3wpmZ1" id="4eKbpy7VDkv" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkw" role="3wpmZR">
-                <property role="2Vclpx" value="-487.2853396123438" />
-                <property role="2Vclpz" value="-171.5" />
+                <property role="2Vclpx" value="-367.5147186257615" />
+                <property role="2Vclpz" value="-151.5" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDkx" role="3wpmZP">
                 <property role="2Vclpx" value="713.5147186257615" />
@@ -968,20 +952,12 @@
             </node>
           </node>
           <node concept="2VclrF" id="1FnP670brCd" role="2Vcluh">
-            <property role="2Vclpx" value="417.39851040299436" />
-            <property role="2Vclpz" value="293.0" />
+            <property role="2Vclpx" value="530.0" />
+            <property role="2Vclpz" value="261.0" />
           </node>
           <node concept="2VclrF" id="1FnP670brCe" role="2Vcluh">
-            <property role="2Vclpx" value="447.82409823118587" />
-            <property role="2Vclpz" value="293.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCf" role="2Vcluh">
-            <property role="2Vclpx" value="447.82409823118587" />
-            <property role="2Vclpz" value="265.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCg" role="2Vcluh">
-            <property role="2Vclpx" value="447.82409823118587" />
-            <property role="2Vclpz" value="167.0" />
+            <property role="2Vclpx" value="530.0" />
+            <property role="2Vclpz" value="187.0" />
           </node>
         </node>
       </node>
@@ -989,15 +965,15 @@
         <property role="37mO49" value="7483173130815597959" />
         <node concept="2VclpC" id="6vp$_2v0Jos" role="37mO4d">
           <node concept="2VclrF" id="6vp$_2v0Jou" role="2Vcluh">
-            <property role="2Vclpx" value="378.4657972327514" />
-            <property role="2Vclpz" value="363.0" />
+            <property role="2Vclpx" value="690.0" />
+            <property role="2Vclpz" value="344.5" />
           </node>
           <node concept="3ul5H1" id="6vp$_2v0Joy" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4eKbpy7VDkC" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkD" role="3wpmZR">
-                <property role="2Vclpx" value="152.2407968512817" />
-                <property role="2Vclpz" value="-265.5" />
+                <property role="2Vclpx" value="572.7749996185303" />
+                <property role="2Vclpz" value="-254.5" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDkE" role="3wpmZP">
                 <property role="2Vclpx" value="128.22500038146973" />
@@ -1009,8 +985,8 @@
             <property role="3ul5GH" value="endRole" />
             <node concept="3wpmZ1" id="4eKbpy7VDkF" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkG" role="3wpmZR">
-                <property role="2Vclpx" value="169.98528137423853" />
-                <property role="2Vclpz" value="-44.45000050233603" />
+                <property role="2Vclpx" value="171.98528137423858" />
+                <property role="2Vclpz" value="-45.95000050233603" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDkH" role="3wpmZP">
                 <property role="2Vclpx" value="156.01471862576142" />
@@ -1019,8 +995,8 @@
             </node>
           </node>
           <node concept="2VclrF" id="6vp$_2v9rRh" role="2Vcluh">
-            <property role="2Vclpx" value="378.4657972327514" />
-            <property role="2Vclpz" value="265.0" />
+            <property role="2Vclpx" value="690.0" />
+            <property role="2Vclpz" value="261.0" />
           </node>
           <node concept="3ul5H1" id="4AXwGoMCJYW" role="3ul5Gx">
             <property role="3ul5GH" value="startRole" />
@@ -1036,20 +1012,12 @@
             </node>
           </node>
           <node concept="2VclrF" id="4AXwGoMG09V" role="2Vcluh">
-            <property role="2Vclpx" value="378.4657972327514" />
-            <property role="2Vclpz" value="129.0" />
+            <property role="2Vclpx" value="690.0" />
+            <property role="2Vclpz" value="124.5" />
           </node>
           <node concept="2VclrF" id="4AXwGoMG09W" role="2Vcluh">
-            <property role="2Vclpx" value="357.99999999999983" />
-            <property role="2Vclpz" value="129.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCh" role="2Vcluh">
-            <property role="2Vclpx" value="357.99999999999983" />
-            <property role="2Vclpz" value="118.5" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCi" role="2Vcluh">
-            <property role="2Vclpx" value="357.99999999999983" />
-            <property role="2Vclpz" value="38.0" />
+            <property role="2Vclpx" value="690.0" />
+            <property role="2Vclpz" value="36.5" />
           </node>
         </node>
       </node>
@@ -1057,19 +1025,19 @@
         <property role="37mO49" value="7483173130815597951" />
         <node concept="2VclpC" id="6vp$_2v0JoE" role="37mO4d">
           <node concept="2VclrF" id="6vp$_2v0JoG" role="2Vcluh">
-            <property role="2Vclpx" value="119.828919053171" />
-            <property role="2Vclpz" value="422.0" />
+            <property role="2Vclpx" value="214.0" />
+            <property role="2Vclpz" value="444.0" />
           </node>
           <node concept="2VclrF" id="6vp$_2v0JoH" role="2Vcluh">
-            <property role="2Vclpx" value="27.7143181120221" />
-            <property role="2Vclpz" value="422.0" />
+            <property role="2Vclpx" value="527.0" />
+            <property role="2Vclpz" value="444.0" />
           </node>
           <node concept="3ul5H1" id="6vp$_2v0JoI" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4eKbpy7VDkI" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkJ" role="3wpmZR">
-                <property role="2Vclpx" value="-738.6455306379779" />
-                <property role="2Vclpz" value="-345.75" />
+                <property role="2Vclpx" value="-323.0" />
+                <property role="2Vclpz" value="-356.75" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDkK" role="3wpmZP">
                 <property role="2Vclpx" value="780.0" />
@@ -1103,37 +1071,21 @@
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="1FnP670brCj" role="2Vcluh">
-            <property role="2Vclpx" value="27.7143181120221" />
-            <property role="2Vclpz" value="411.5" />
+          <node concept="2VclrF" id="6O6KyRoyamm" role="2Vcluh">
+            <property role="2Vclpx" value="527.0" />
+            <property role="2Vclpz" value="413.5" />
           </node>
-          <node concept="2VclrF" id="1FnP670brCk" role="2Vcluh">
-            <property role="2Vclpx" value="27.7143181120221" />
-            <property role="2Vclpz" value="401.0" />
+          <node concept="2VclrF" id="6O6KyRoyamn" role="2Vcluh">
+            <property role="2Vclpx" value="527.0" />
+            <property role="2Vclpz" value="261.0" />
           </node>
-          <node concept="2VclrF" id="1FnP670brCl" role="2Vcluh">
-            <property role="2Vclpx" value="30.3544693620221" />
-            <property role="2Vclpz" value="401.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCm" role="2Vcluh">
-            <property role="2Vclpx" value="30.3544693620221" />
-            <property role="2Vclpz" value="293.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCn" role="2Vcluh">
-            <property role="2Vclpx" value="96.1192191384215" />
-            <property role="2Vclpz" value="293.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCo" role="2Vcluh">
-            <property role="2Vclpx" value="96.1192191384215" />
-            <property role="2Vclpz" value="265.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCp" role="2Vcluh">
-            <property role="2Vclpx" value="96.1192191384215" />
-            <property role="2Vclpz" value="257.0" />
+          <node concept="2VclrF" id="6O6KyRoyamo" role="2Vcluh">
+            <property role="2Vclpx" value="527.0" />
+            <property role="2Vclpz" value="253.0" />
           </node>
-          <node concept="2VclrF" id="1FnP670brCq" role="2Vcluh">
-            <property role="2Vclpx" value="166.22937901341763" />
-            <property role="2Vclpz" value="257.0" />
+          <node concept="2VclrF" id="6O6KyRoyamp" role="2Vcluh">
+            <property role="2Vclpx" value="287.0" />
+            <property role="2Vclpz" value="253.0" />
           </node>
         </node>
       </node>
@@ -1144,8 +1096,8 @@
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4eKbpy7VDkL" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkM" role="3wpmZR">
-                <property role="2Vclpx" value="-266.7765716965936" />
-                <property role="2Vclpz" value="-266.25" />
+                <property role="2Vclpx" value="-126.0" />
+                <property role="2Vclpz" value="-270.25" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDkN" role="3wpmZP">
                 <property role="2Vclpx" value="270.0" />
@@ -1154,12 +1106,12 @@
             </node>
           </node>
           <node concept="2VclrF" id="6vp$_2vd3FZ" role="2Vcluh">
-            <property role="2Vclpx" value="119.828919053171" />
-            <property role="2Vclpz" value="422.0" />
+            <property role="2Vclpx" value="214.0" />
+            <property role="2Vclpz" value="413.5" />
           </node>
           <node concept="2VclrF" id="6vp$_2vd3G0" role="2Vcluh">
-            <property role="2Vclpx" value="27.7143181120221" />
-            <property role="2Vclpz" value="422.0" />
+            <property role="2Vclpx" value="214.0" />
+            <property role="2Vclpz" value="336.0" />
           </node>
           <node concept="3ul5H1" id="4AXwGoMCJZ8" role="3ul5Gx">
             <property role="3ul5GH" value="startRole" />
@@ -1188,44 +1140,12 @@
             </node>
           </node>
           <node concept="2VclrF" id="1FnP670brCr" role="2Vcluh">
-            <property role="2Vclpx" value="27.7143181120221" />
-            <property role="2Vclpz" value="411.5" />
+            <property role="2Vclpx" value="214.0" />
+            <property role="2Vclpz" value="194.0" />
           </node>
           <node concept="2VclrF" id="1FnP670brCs" role="2Vcluh">
-            <property role="2Vclpx" value="27.7143181120221" />
-            <property role="2Vclpz" value="347.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCt" role="2Vcluh">
-            <property role="2Vclpx" value="27.7143181120221" />
-            <property role="2Vclpz" value="273.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCu" role="2Vcluh">
-            <property role="2Vclpx" value="73.22342830340645" />
-            <property role="2Vclpz" value="273.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCv" role="2Vcluh">
-            <property role="2Vclpx" value="73.22342830340645" />
-            <property role="2Vclpz" value="237.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCw" role="2Vcluh">
-            <property role="2Vclpx" value="122.98842901341763" />
-            <property role="2Vclpz" value="237.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCx" role="2Vcluh">
-            <property role="2Vclpx" value="122.98842901341763" />
-            <property role="2Vclpz" value="183.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670brCy" role="2Vcluh">
-            <property role="2Vclpx" value="122.98842901341763" />
-            <property role="2Vclpz" value="118.5" />
-          </node>
-          <node concept="2VclrF" id="1FnP670fuvn" role="2Vcluh">
-            <property role="2Vclpx" value="122.98842901341763" />
-            <property role="2Vclpz" value="108.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670fuvo" role="2Vcluh">
-            <property role="2Vclpx" value="211.0" />
-            <property role="2Vclpz" value="108.0" />
+            <property role="2Vclpx" value="214.0" />
+            <property role="2Vclpz" value="124.5" />
           </node>
         </node>
       </node>
@@ -1236,8 +1156,8 @@
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4eKbpy7VDkO" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkP" role="3wpmZR">
-                <property role="2Vclpx" value="-607.8955306379779" />
-                <property role="2Vclpz" value="-206.0" />
+                <property role="2Vclpx" value="-511.25" />
+                <property role="2Vclpz" value="-210.0" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDkQ" role="3wpmZP">
                 <property role="2Vclpx" value="728.25" />
@@ -1245,14 +1165,6 @@
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="4eKbpy7VDiS" role="2Vcluh">
-            <property role="2Vclpx" value="190.35446936202212" />
-            <property role="2Vclpz" value="257.0" />
-          </node>
-          <node concept="2VclrF" id="4eKbpy7VDiT" role="2Vcluh">
-            <property role="2Vclpx" value="166.22937901341763" />
-            <property role="2Vclpz" value="257.0" />
-          </node>
           <node concept="3ul5H1" id="4AXwGoMCJZg" role="3ul5Gx">
             <property role="3ul5GH" value="startRole" />
             <node concept="3wpmZ1" id="4AXwGoMCJZh" role="3ul5Gz">
@@ -1288,8 +1200,8 @@
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4eKbpy7VDkd" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDke" role="3wpmZR">
-                <property role="2Vclpx" value="-414.67108094682897" />
-                <property role="2Vclpz" value="-243.0" />
+                <property role="2Vclpx" value="-247.5" />
+                <property role="2Vclpz" value="-241.0" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDkf" role="3wpmZP">
                 <property role="2Vclpx" value="482.5" />
@@ -1324,12 +1236,12 @@
             </node>
           </node>
           <node concept="2VclrF" id="1FnP670brCb" role="2Vcluh">
-            <property role="2Vclpx" value="119.828919053171" />
-            <property role="2Vclpz" value="401.0" />
+            <property role="2Vclpx" value="214.0" />
+            <property role="2Vclpz" value="444.0" />
           </node>
           <node concept="2VclrF" id="1FnP670brCc" role="2Vcluh">
-            <property role="2Vclpx" value="190.35446936202212" />
-            <property role="2Vclpz" value="401.0" />
+            <property role="2Vclpx" value="287.0" />
+            <property role="2Vclpz" value="444.0" />
           </node>
         </node>
       </node>
@@ -1337,15 +1249,15 @@
         <property role="37mO49" value="7483173130817877821" />
         <node concept="2VclpC" id="6vp$_2v9ru3" role="37mO4d">
           <node concept="2VclrF" id="6vp$_2v9ru5" role="2Vcluh">
-            <property role="2Vclpx" value="431.32409823118587" />
-            <property role="2Vclpz" value="199.0" />
+            <property role="2Vclpx" value="575.0" />
+            <property role="2Vclpz" value="206.0" />
           </node>
           <node concept="3ul5H1" id="6vp$_2v9ru7" role="3ul5Gx">
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4eKbpy7VDky" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkz" role="3wpmZR">
-                <property role="2Vclpx" value="-62.77500152587908" />
-                <property role="2Vclpz" value="-134.0" />
+                <property role="2Vclpx" value="164.2249984741211" />
+                <property role="2Vclpz" value="-128.0" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDk$" role="3wpmZP">
                 <property role="2Vclpx" value="421.7750015258789" />
@@ -1357,8 +1269,8 @@
             <property role="3ul5GH" value="endRole" />
             <node concept="3wpmZ1" id="4eKbpy7VDk_" role="3ul5Gz">
               <node concept="2VclrF" id="4eKbpy7VDkA" role="3wpmZR">
-                <property role="2Vclpx" value="169.9852813742385" />
-                <property role="2Vclpz" value="-31.55000107818465" />
+                <property role="2Vclpx" value="171.98528137423855" />
+                <property role="2Vclpz" value="-46.05000107818465" />
               </node>
               <node concept="2VclrF" id="4eKbpy7VDkB" role="3wpmZP">
                 <property role="2Vclpx" value="156.01471862576145" />
@@ -1367,8 +1279,8 @@
             </node>
           </node>
           <node concept="2VclrF" id="6vp$_2v9rRa" role="2Vcluh">
-            <property role="2Vclpx" value="431.32409823118587" />
-            <property role="2Vclpz" value="129.0" />
+            <property role="2Vclpx" value="575.0" />
+            <property role="2Vclpz" value="55.5" />
           </node>
           <node concept="3ul5H1" id="4AXwGoMCJYS" role="3ul5Gx">
             <property role="3ul5GH" value="startRole" />
@@ -1383,14 +1295,6 @@
               </node>
             </node>
           </node>
-          <node concept="2VclrF" id="1FnP670fuvl" role="2Vcluh">
-            <property role="2Vclpx" value="472.99999999999983" />
-            <property role="2Vclpz" value="129.0" />
-          </node>
-          <node concept="2VclrF" id="1FnP670fuvm" role="2Vcluh">
-            <property role="2Vclpx" value="472.99999999999983" />
-            <property role="2Vclpz" value="70.0" />
-          </node>
         </node>
       </node>
       <node concept="37mRIm" id="6vp$_2vCrhR" role="37mRID">
@@ -1493,32 +1397,32 @@
       <node concept="37mRIm" id="4XdNxtB3llb" role="37mRID">
         <property role="37mO49" value="1151688443754" />
         <node concept="gqqVs" id="4XdNxtB3ll9" role="37mO4d">
-          <property role="gqqTZ" value="89.0" />
-          <property role="gqqTW" value="219.0" />
-          <property role="gqqTX" value="82.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTZ" value="116.0" />
+          <property role="gqqTW" value="144.0" />
+          <property role="gqqTX" value="76.0" />
+          <property role="gqqTy" value="49.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="4XdNxtB3llc" role="1pap1a">
             <property role="1pa3iD" value="extensions" />
-            <property role="2gRgW$" value="524088270" />
+            <property role="2gRgW$" value="522742729" />
           </node>
           <node concept="1pa3jb" id="4XdNxtB3lld" role="1pap1a">
             <property role="1pa3iD" value="subtypes" />
-            <property role="2gRgW$" value="1597830093" />
+            <property role="2gRgW$" value="1596484552" />
           </node>
           <node concept="1pa3jb" id="4XdNxtB3lle" role="1pap1a">
             <property role="1pa3iD" value="link0" />
-            <property role="2gRgW$" value="1610612734" />
+            <property role="2gRgW$" value="1643482382" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="4XdNxtB3ll_" role="37mRID">
         <property role="37mO49" value="3358009230509553641" />
         <node concept="gqqVs" id="4XdNxtB3ll$" role="37mO4d">
-          <property role="gqqTZ" value="69.0" />
-          <property role="gqqTW" value="369.0" />
-          <property role="gqqTX" value="122.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTZ" value="92.0" />
+          <property role="gqqTW" value="271.0" />
+          <property role="gqqTX" value="124.0" />
+          <property role="gqqTy" value="49.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="3YJTqBzfPGi" role="1pap1a">
             <property role="1pa3iD" value="extensions" />
@@ -1537,8 +1441,8 @@
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4XdNxtB3llD" role="3ul5Gz">
               <node concept="2VclrF" id="4XdNxtB3llE" role="3wpmZR">
-                <property role="2Vclpx" value="-23.0" />
-                <property role="2Vclpz" value="78.5" />
+                <property role="2Vclpx" value="0.0" />
+                <property role="2Vclpz" value="-19.5" />
               </node>
               <node concept="2VclrF" id="4XdNxtB3llF" role="3wpmZP">
                 <property role="2Vclpx" value="102.0" />
@@ -1577,22 +1481,22 @@
       <node concept="37mRIm" id="4XdNxtB3ln5" role="37mRID">
         <property role="37mO49" value="1068431790189" />
         <node concept="gqqVs" id="4XdNxtB3ln4" role="37mO4d">
-          <property role="gqqTZ" value="227.0" />
-          <property role="gqqTW" value="24.0" />
-          <property role="gqqTX" value="82.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTZ" value="70.0" />
+          <property role="gqqTW" value="12.0" />
+          <property role="gqqTX" value="77.0" />
+          <property role="gqqTy" value="53.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="3YJTqBzfPGk" role="1pap1a">
             <property role="1pa3iD" value="extensions" />
-            <property role="2gRgW$" value="524088270" />
+            <property role="2gRgW$" value="520602096" />
           </node>
           <node concept="1pa3jb" id="3YJTqBzfPGl" role="1pap1a">
             <property role="1pa3iD" value="subtypes" />
-            <property role="2gRgW$" value="1597830093" />
+            <property role="2gRgW$" value="1594343919" />
           </node>
           <node concept="1pa3jb" id="3YJTqBzfPGm" role="1pap1a">
             <property role="1pa3iD" value="linkInput0" />
-            <property role="2gRgW$" value="536870911" />
+            <property role="2gRgW$" value="1643482382" />
           </node>
         </node>
       </node>
@@ -1603,8 +1507,8 @@
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4XdNxtB3ln9" role="3ul5Gz">
               <node concept="2VclrF" id="4XdNxtB3lna" role="3wpmZR">
-                <property role="2Vclpx" value="40.0" />
-                <property role="2Vclpz" value="47.0" />
+                <property role="2Vclpx" value="0.0" />
+                <property role="2Vclpz" value="-8.0" />
               </node>
               <node concept="2VclrF" id="4XdNxtB3lnb" role="3wpmZP">
                 <property role="2Vclpx" value="102.0" />
@@ -1639,12 +1543,12 @@
             </node>
           </node>
           <node concept="2VclrF" id="3YJTqBzfPGp" role="2Vcluh">
-            <property role="2Vclpx" value="131.0" />
-            <property role="2Vclpz" value="126.0" />
+            <property role="2Vclpx" value="154.0" />
+            <property role="2Vclpz" value="91.0" />
           </node>
           <node concept="2VclrF" id="3YJTqBzfPGq" role="2Vcluh">
-            <property role="2Vclpx" value="269.0" />
-            <property role="2Vclpz" value="126.0" />
+            <property role="2Vclpx" value="103.0" />
+            <property role="2Vclpz" value="91.0" />
           </node>
         </node>
       </node>
@@ -1655,8 +1559,8 @@
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4XdNxtB3lnn" role="3ul5Gz">
               <node concept="2VclrF" id="4XdNxtB3lno" role="3wpmZR">
-                <property role="2Vclpx" value="-214.0257804578955" />
-                <property role="2Vclpz" value="258.2587476193189" />
+                <property role="2Vclpx" value="-6.525780457895507" />
+                <property role="2Vclpz" value="203.2587476193189" />
               </node>
               <node concept="2VclrF" id="4XdNxtB3lnp" role="3wpmZP">
                 <property role="2Vclpx" value="226.0257804578955" />
@@ -1681,8 +1585,8 @@
             <property role="3ul5GH" value="endRole" />
             <node concept="3wpmZ1" id="4XdNxtB3lnv" role="3ul5Gz">
               <node concept="2VclrF" id="4XdNxtB3lnw" role="3wpmZR">
-                <property role="2Vclpx" value="146.0" />
-                <property role="2Vclpz" value="9.485281374238571" />
+                <property role="2Vclpx" value="105.0" />
+                <property role="2Vclpz" value="-14.014718625761429" />
               </node>
               <node concept="2VclrF" id="4XdNxtB3lnx" role="3wpmZP">
                 <property role="2Vclpx" value="51.0" />
@@ -1691,30 +1595,22 @@
             </node>
           </node>
           <node concept="2VclrF" id="4XdNxtB3lpR" role="2Vcluh">
-            <property role="2Vclpx" value="203.0" />
-            <property role="2Vclpz" value="253.0" />
+            <property role="2Vclpx" value="208.5" />
+            <property role="2Vclpz" value="166.5" />
           </node>
           <node concept="2VclrF" id="4XdNxtB3lpZ" role="2Vcluh">
-            <property role="2Vclpx" value="203.0" />
-            <property role="2Vclpz" value="187.0" />
-          </node>
-          <node concept="2VclrF" id="4XdNxtB3lq8" role="2Vcluh">
-            <property role="2Vclpx" value="110.0" />
-            <property role="2Vclpz" value="187.0" />
-          </node>
-          <node concept="2VclrF" id="3YJTqBzfPGr" role="2Vcluh">
-            <property role="2Vclpx" value="110.0" />
-            <property role="2Vclpz" value="58.0" />
+            <property role="2Vclpx" value="208.5" />
+            <property role="2Vclpz" value="34.5" />
           </node>
         </node>
       </node>
       <node concept="37mRIm" id="4XdNxtB3lqu" role="37mRID">
         <property role="37mO49" value="1225271177708" />
         <node concept="gqqVs" id="4XdNxtB3lqt" role="37mO4d">
-          <property role="gqqTZ" value="223.0" />
-          <property role="gqqTW" value="219.0" />
-          <property role="gqqTX" value="90.0" />
-          <property role="gqqTy" value="70.0" />
+          <property role="gqqTZ" value="6.0" />
+          <property role="gqqTW" value="144.0" />
+          <property role="gqqTX" value="92.0" />
+          <property role="gqqTy" value="49.0" />
           <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
           <node concept="1pa3jb" id="3YJTqBzfPGn" role="1pap1a">
             <property role="1pa3iD" value="extensions" />
@@ -1733,8 +1629,8 @@
             <property role="3ul5GH" value="label" />
             <node concept="3wpmZ1" id="4XdNxtB3lqy" role="3ul5Gz">
               <node concept="2VclrF" id="4XdNxtB3lqz" role="3wpmZR">
-                <property role="2Vclpx" value="211.5" />
-                <property role="2Vclpz" value="70.5" />
+                <property role="2Vclpx" value="-5.5" />
+                <property role="2Vclpz" value="15.5" />
               </node>
               <node concept="2VclrF" id="4XdNxtB3lq$" role="3wpmZP">
                 <property role="2Vclpx" value="5.5" />
@@ -1768,6 +1664,14 @@
               </node>
             </node>
           </node>
+          <node concept="2VclrF" id="6O6KyRmZExm" role="2Vcluh">
+            <property role="2Vclpx" value="52.0" />
+            <property role="2Vclpz" value="91.0" />
+          </node>
+          <node concept="2VclrF" id="6O6KyRmZExn" role="2Vcluh">
+            <property role="2Vclpx" value="103.0" />
+            <property role="2Vclpz" value="91.0" />
+          </node>
         </node>
       </node>
     </node>
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps
index 287b722b02e..8e49b94b1e9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps
@@ -3959,6 +3959,32 @@
             </node>
           </node>
         </node>
+        <node concept="pkWqt" id="1FnP670bWFL" role="qiu7m">
+          <node concept="3clFbS" id="1FnP670bWFM" role="2VODD2">
+            <node concept="3clFbF" id="1FnP670c3hZ" role="3cqZAp">
+              <node concept="3fqX7Q" id="1FnP670cdNY" role="3clFbG">
+                <node concept="2OqwBi" id="1FnP670cdO0" role="3fr31v">
+                  <node concept="pncrf" id="1FnP670cdO1" role="2Oq$k0" />
+                  <node concept="3TrcHB" id="1FnP670cdO2" role="2OqNvi">
+                    <ref role="3TsBF5" to="45ke:1FnP670bD7A" resolve="dontSaveLayoutData" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="pkWqt" id="1FnP670bQ_f" role="2Dxx3A">
+          <node concept="3clFbS" id="1FnP670bQ_g" role="2VODD2">
+            <node concept="3clFbF" id="1FnP670bVSx" role="3cqZAp">
+              <node concept="2OqwBi" id="1FnP670bWvm" role="3clFbG">
+                <node concept="pncrf" id="1FnP670bWvn" role="2Oq$k0" />
+                <node concept="3TrcHB" id="1FnP670bWvo" role="2OqNvi">
+                  <ref role="3TsBF5" to="45ke:1FnP670dN3d" resolve="autoLayoutOnInit" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3tD6jV" id="1FnP66Zec8j" role="3F10Kt">
           <ref role="3tD7wE" to="88j9:56jSwhzYNtN" resolve="diagram-layout-edge-node-spacing" />
           <node concept="3sjG9q" id="1FnP66Zec8k" role="3tD6jU">
@@ -4026,45 +4052,6 @@
             </node>
           </node>
         </node>
-        <node concept="3tD6jV" id="1FnP66ZvHP3" role="3F10Kt">
-          <ref role="3tD7wE" to="88j9:56jSwhzYiVL" resolve="diagram-layout-layered-node-placement-strategy" />
-          <node concept="3sjG9q" id="1FnP66ZvHP5" role="3tD6jU">
-            <node concept="3clFbS" id="1FnP66ZvHP7" role="2VODD2">
-              <node concept="3clFbF" id="1FnP66ZvOfN" role="3cqZAp">
-                <node concept="Rm8GO" id="1FnP66ZzBaV" role="3clFbG">
-                  <ref role="Rm8GQ" to="u8j:~NodePlacementStrategy.LINEAR_SEGMENTS" resolve="LINEAR_SEGMENTS" />
-                  <ref role="1Px2BO" to="u8j:~NodePlacementStrategy" resolve="NodePlacementStrategy" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="pkWqt" id="1FnP670bWFL" role="qiu7m">
-          <node concept="3clFbS" id="1FnP670bWFM" role="2VODD2">
-            <node concept="3clFbF" id="1FnP670c3hZ" role="3cqZAp">
-              <node concept="3fqX7Q" id="1FnP670cdNY" role="3clFbG">
-                <node concept="2OqwBi" id="1FnP670cdO0" role="3fr31v">
-                  <node concept="pncrf" id="1FnP670cdO1" role="2Oq$k0" />
-                  <node concept="3TrcHB" id="1FnP670cdO2" role="2OqNvi">
-                    <ref role="3TsBF5" to="45ke:1FnP670bD7A" resolve="dontSaveLayoutData" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="pkWqt" id="1FnP670bQ_f" role="2Dxx3A">
-          <node concept="3clFbS" id="1FnP670bQ_g" role="2VODD2">
-            <node concept="3clFbF" id="1FnP670bVSx" role="3cqZAp">
-              <node concept="2OqwBi" id="1FnP670bWvm" role="3clFbG">
-                <node concept="pncrf" id="1FnP670bWvn" role="2Oq$k0" />
-                <node concept="3TrcHB" id="1FnP670bWvo" role="2OqNvi">
-                  <ref role="3TsBF5" to="45ke:1FnP670dN3d" resolve="autoLayoutOnInit" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="2iRkQZ" id="2igMYjpAqwn" role="2iSdaV" />
     </node>