diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index b7e597cf..1fd64223 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -1924,19 +1924,6 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbF" id="6IQb_Rxsy5O" role="3cqZAp">
-                              <node concept="2OqwBi" id="6IQb_Rxsy5P" role="3clFbG">
-                                <node concept="37vLTw" id="2daneBOUuMI" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2daneBOT1Cq" resolve="openedTab" />
-                                </node>
-                                <node concept="liA8E" id="6IQb_Rxsy5R" role="2OqNvi">
-                                  <ref role="37wK5l" to="o35r:6_UQWSXcgLF" resolve="setContextEditorComponent" />
-                                  <node concept="37vLTw" id="6IQb_Rxsy5S" role="37wK5m">
-                                    <ref role="3cqZAo" node="6IQb_Rxsgb3" resolve="editorComponent" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
                             <node concept="3clFbF" id="6IQb_Rxsy5T" role="3cqZAp">
                               <node concept="2OqwBi" id="6IQb_Rxsy5U" role="3clFbG">
                                 <node concept="37vLTw" id="2daneBOUwlg" role="2Oq$k0">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index f5400644..7aedd584 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -49,6 +49,7 @@
     <import index="z1c4" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
     <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
     <import index="et5u" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.messages(MPS.Core/)" />
+    <import index="1yqb" ref="r:bd76f794-cfad-45dd-9c1c-e3203d1c5c7a(jetbrains.mps.coderules.service)" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -116,6 +117,9 @@
       <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
+      <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
+        <reference id="2820489544401957798" name="classifier" index="HV5vE" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -138,6 +142,9 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
@@ -221,6 +228,7 @@
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="1171903862077" name="jetbrains.mps.baseLanguage.structure.LowerBoundType" flags="in" index="3qUtgH">
@@ -254,6 +262,9 @@
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </concept>
     </language>
     <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
       <concept id="4079382982702596667" name="jetbrains.mps.baseLanguage.checkedDots.structure.CheckedDotExpression" flags="nn" index="2EnYce" />
@@ -1465,19 +1476,49 @@
           </node>
         </node>
         <node concept="3clFbS" id="siuT5mmA0f" role="3clF47">
-          <node concept="3cpWs8" id="4MaHsBE6dDW" role="3cqZAp">
-            <node concept="3cpWsn" id="4MaHsBE6dDX" role="3cpWs9">
-              <property role="TrG5h" value="typeOf" />
-              <node concept="3Tqbb2" id="4MaHsBE64Yq" role="1tU5fm" />
-              <node concept="2YIFZM" id="4MaHsBE6dDY" role="33vP2m">
-                <ref role="37wK5l" to="tj24:3IIf9O_u0Ck" resolve="typeOf" />
-                <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                <node concept="37vLTw" id="4MaHsBE6dDZ" role="37wK5m">
-                  <ref role="3cqZAo" node="siuT5mmA0c" resolve="node" />
+          <node concept="3cpWs8" id="2qsG4AwJYbS" role="3cqZAp">
+            <node concept="3cpWsn" id="2qsG4AwJYbT" role="3cpWs9">
+              <property role="TrG5h" value="to" />
+              <node concept="3uibUv" id="2qsG4AwJY7J" role="1tU5fm">
+                <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+              </node>
+              <node concept="2ShNRf" id="2qsG4AwJYbU" role="33vP2m">
+                <node concept="HV5vD" id="2qsG4AwJYbV" role="2ShVmc">
+                  <ref role="HV5vE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3cpWs8" id="4MaHsBE6dDW" role="3cqZAp">
+            <node concept="3cpWsn" id="4MaHsBE6dDX" role="3cpWs9">
+              <property role="TrG5h" value="typeOf" />
+              <node concept="3Tqbb2" id="4MaHsBE64Yq" role="1tU5fm" />
+              <node concept="2OqwBi" id="2qsG4AwK3fF" role="33vP2m">
+                <node concept="2OqwBi" id="2qsG4AwK3fG" role="2Oq$k0">
+                  <node concept="2YIFZM" id="2qsG4AwK3fH" role="2Oq$k0">
+                    <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                    <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
+                    <node concept="37vLTw" id="2qsG4AwK3fI" role="37wK5m">
+                      <ref role="3cqZAo" node="siuT5mmA0c" resolve="node" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="2qsG4AwK3fJ" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                    <node concept="37vLTw" id="2qsG4AwK3fK" role="37wK5m">
+                      <ref role="3cqZAo" node="2qsG4AwJYbT" resolve="to" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="2qsG4AwK3fL" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:3IIf9O_tkwF" resolve="calcTypeOf" />
+                  <node concept="37vLTw" id="2qsG4AwK3fM" role="37wK5m">
+                    <ref role="3cqZAo" node="siuT5mmA0c" resolve="node" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2qsG4AwIYzg" role="3cqZAp" />
           <node concept="3clFbF" id="4MaHsBE5WCw" role="3cqZAp">
             <node concept="2OqwBi" id="4MaHsBE5XSU" role="3clFbG">
               <node concept="2YIFZM" id="4MaHsBE5WXh" role="2Oq$k0">
@@ -1493,8 +1534,8 @@
               <node concept="liA8E" id="4MaHsBE5Y5q" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:4MaHsBDgiaT" resolve="handle" />
                 <node concept="2YIFZM" id="4MaHsBE5Z7s" role="37wK5m">
-                  <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String)" resolve="createMessage" />
                   <ref role="1Pybhc" to="et5u:~Message" resolve="Message" />
+                  <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String,java.lang.Object)" resolve="createMessage" />
                   <node concept="Rm8GO" id="4MaHsBE5ZDy" role="37wK5m">
                     <ref role="Rm8GQ" to="et5u:~MessageKind.INFORMATION" resolve="INFORMATION" />
                     <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
@@ -1525,10 +1566,14 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="37vLTw" id="2qsG4AwK55F" role="37wK5m">
+                    <ref role="3cqZAo" node="2qsG4AwJYbT" resolve="to" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="2qsG4AwK5I3" role="3cqZAp" />
           <node concept="3clFbF" id="1oUwjADnRbu" role="3cqZAp">
             <node concept="37vLTw" id="4MaHsBE6dE0" role="3clFbG">
               <ref role="3cqZAo" node="4MaHsBE6dDX" resolve="typeOf" />
@@ -1557,22 +1602,55 @@
           </node>
         </node>
         <node concept="3clFbS" id="siuT5mmA0s" role="3clF47">
-          <node concept="3cpWs8" id="4MaHsBE6gNP" role="3cqZAp">
-            <node concept="3cpWsn" id="4MaHsBE6gNQ" role="3cpWs9">
-              <property role="TrG5h" value="convertsTo" />
-              <node concept="10P_77" id="4MaHsBDek3p" role="1tU5fm" />
-              <node concept="2YIFZM" id="4MaHsBE6gNR" role="33vP2m">
-                <ref role="37wK5l" to="tj24:3IIf9OA4ZMD" resolve="convertsTo" />
-                <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                <node concept="37vLTw" id="4MaHsBE6gNS" role="37wK5m">
-                  <ref role="3cqZAo" node="siuT5mmA0n" resolve="type" />
-                </node>
-                <node concept="37vLTw" id="4MaHsBE6gNT" role="37wK5m">
-                  <ref role="3cqZAo" node="siuT5mmA0p" resolve="trgType" />
+          <node concept="3cpWs8" id="2qsG4AwKAtU" role="3cqZAp">
+            <node concept="3cpWsn" id="2qsG4AwKAtV" role="3cpWs9">
+              <property role="TrG5h" value="to" />
+              <node concept="3uibUv" id="2qsG4AwKAtW" role="1tU5fm">
+                <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+              </node>
+              <node concept="2ShNRf" id="2qsG4AwKAtX" role="33vP2m">
+                <node concept="HV5vD" id="2qsG4AwKAtY" role="2ShVmc">
+                  <ref role="HV5vE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3cpWs8" id="2qsG4AwKAtZ" role="3cqZAp">
+            <node concept="3cpWsn" id="2qsG4AwKAu0" role="3cpWs9">
+              <property role="TrG5h" value="convertsTo" />
+              <node concept="10P_77" id="2qsG4AwKFoY" role="1tU5fm" />
+              <node concept="2OqwBi" id="2qsG4AwKAu2" role="33vP2m">
+                <node concept="2OqwBi" id="2qsG4AwKAu3" role="2Oq$k0">
+                  <node concept="2YIFZM" id="2qsG4AwKB6p" role="2Oq$k0">
+                    <ref role="37wK5l" to="tj24:2qsG4AwIYLn" resolve="for2Node" />
+                    <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                    <node concept="37vLTw" id="2qsG4AwKBBk" role="37wK5m">
+                      <ref role="3cqZAo" node="siuT5mmA0n" resolve="type" />
+                    </node>
+                    <node concept="37vLTw" id="2qsG4AwKCh1" role="37wK5m">
+                      <ref role="3cqZAo" node="siuT5mmA0p" resolve="trgType" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="2qsG4AwKAu6" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                    <node concept="37vLTw" id="2qsG4AwKAu7" role="37wK5m">
+                      <ref role="3cqZAo" node="2qsG4AwKAtV" resolve="to" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="2qsG4AwKAu8" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:3IIf9OAgpFT" resolve="calcConverts" />
+                  <node concept="37vLTw" id="2qsG4AwKEfL" role="37wK5m">
+                    <ref role="3cqZAo" node="siuT5mmA0n" resolve="type" />
+                  </node>
+                  <node concept="37vLTw" id="2qsG4AwKF0$" role="37wK5m">
+                    <ref role="3cqZAo" node="siuT5mmA0p" resolve="trgType" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2qsG4AwKA4n" role="3cqZAp" />
           <node concept="3clFbF" id="4MaHsBE6h3p" role="3cqZAp">
             <node concept="2OqwBi" id="4MaHsBE6h3q" role="3clFbG">
               <node concept="2YIFZM" id="4MaHsBE6h3r" role="2Oq$k0">
@@ -1588,8 +1666,8 @@
               <node concept="liA8E" id="4MaHsBE6h3u" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:4MaHsBDgiaT" resolve="handle" />
                 <node concept="2YIFZM" id="4MaHsBE6h3v" role="37wK5m">
-                  <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String)" resolve="createMessage" />
                   <ref role="1Pybhc" to="et5u:~Message" resolve="Message" />
+                  <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String,java.lang.Object)" resolve="createMessage" />
                   <node concept="Rm8GO" id="4MaHsBE6h3w" role="37wK5m">
                     <ref role="Rm8GQ" to="et5u:~MessageKind.INFORMATION" resolve="INFORMATION" />
                     <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
@@ -1603,8 +1681,8 @@
                     </node>
                   </node>
                   <node concept="3cpWs3" id="4MaHsBE6h3$" role="37wK5m">
-                    <node concept="37vLTw" id="4MaHsBE6ly0" role="3uHU7w">
-                      <ref role="3cqZAo" node="4MaHsBE6gNQ" resolve="convertsTo" />
+                    <node concept="37vLTw" id="2qsG4AwKHpA" role="3uHU7w">
+                      <ref role="3cqZAo" node="2qsG4AwKAu0" resolve="convertsTo" />
                     </node>
                     <node concept="3cpWs3" id="4MaHsBE6j3g" role="3uHU7B">
                       <node concept="3cpWs3" id="4MaHsBE6jOA" role="3uHU7B">
@@ -1630,13 +1708,17 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="37vLTw" id="2qsG4AwKDcO" role="37wK5m">
+                    <ref role="3cqZAo" node="2qsG4AwKAtV" resolve="to" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="2qsG4AwKHF$" role="3cqZAp" />
           <node concept="3clFbF" id="1oUwjADo1wN" role="3cqZAp">
-            <node concept="37vLTw" id="4MaHsBE6gNU" role="3clFbG">
-              <ref role="3cqZAo" node="4MaHsBE6gNQ" resolve="convertsTo" />
+            <node concept="37vLTw" id="2qsG4AwKGR$" role="3clFbG">
+              <ref role="3cqZAo" node="2qsG4AwKAu0" resolve="convertsTo" />
             </node>
           </node>
         </node>
@@ -1664,22 +1746,55 @@
           </node>
         </node>
         <node concept="3clFbS" id="siuT5mmA0D" role="3clF47">
-          <node concept="3cpWs8" id="3KN3A4uAbN9" role="3cqZAp">
-            <node concept="3cpWsn" id="3KN3A4uAbNa" role="3cpWs9">
-              <property role="TrG5h" value="coerceTo" />
-              <node concept="3Tqbb2" id="3KN3A4uA9r9" role="1tU5fm" />
-              <node concept="2YIFZM" id="3KN3A4uAbNb" role="33vP2m">
-                <ref role="37wK5l" to="tj24:7Bx7XgEibEE" resolve="coerceTo" />
-                <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
-                <node concept="37vLTw" id="3KN3A4uAbNc" role="37wK5m">
-                  <ref role="3cqZAo" node="siuT5mmA0$" resolve="type" />
-                </node>
-                <node concept="37vLTw" id="3KN3A4uAbNd" role="37wK5m">
-                  <ref role="3cqZAo" node="siuT5mmA0A" resolve="trgConcept" />
+          <node concept="3cpWs8" id="2qsG4AwKIeD" role="3cqZAp">
+            <node concept="3cpWsn" id="2qsG4AwKIeE" role="3cpWs9">
+              <property role="TrG5h" value="to" />
+              <node concept="3uibUv" id="2qsG4AwKIeF" role="1tU5fm">
+                <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+              </node>
+              <node concept="2ShNRf" id="2qsG4AwKIeG" role="33vP2m">
+                <node concept="HV5vD" id="2qsG4AwKIeH" role="2ShVmc">
+                  <ref role="HV5vE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3cpWs8" id="2qsG4AwKIeI" role="3cqZAp">
+            <node concept="3cpWsn" id="2qsG4AwKIeJ" role="3cpWs9">
+              <property role="TrG5h" value="coerceTo" />
+              <node concept="3Tqbb2" id="2qsG4AwKKKV" role="1tU5fm" />
+              <node concept="2OqwBi" id="2qsG4AwKIeL" role="33vP2m">
+                <node concept="2OqwBi" id="2qsG4AwKIeM" role="2Oq$k0">
+                  <node concept="2YIFZM" id="2qsG4AwKIRV" role="2Oq$k0">
+                    <ref role="37wK5l" to="tj24:2qsG4AwKdr0" resolve="forNodeAndConcept" />
+                    <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                    <node concept="37vLTw" id="2qsG4AwKIRW" role="37wK5m">
+                      <ref role="3cqZAo" node="siuT5mmA0$" resolve="type" />
+                    </node>
+                    <node concept="37vLTw" id="2qsG4AwKJrR" role="37wK5m">
+                      <ref role="3cqZAo" node="siuT5mmA0A" resolve="trgConcept" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="2qsG4AwKIeQ" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                    <node concept="37vLTw" id="2qsG4AwKIeR" role="37wK5m">
+                      <ref role="3cqZAo" node="2qsG4AwKIeE" resolve="to" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="2qsG4AwKIeS" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:7Bx7XgEiqaI" resolve="calcCoerce" />
+                  <node concept="37vLTw" id="2qsG4AwKIeT" role="37wK5m">
+                    <ref role="3cqZAo" node="siuT5mmA0$" resolve="type" />
+                  </node>
+                  <node concept="37vLTw" id="2qsG4AwKK9o" role="37wK5m">
+                    <ref role="3cqZAo" node="siuT5mmA0A" resolve="trgConcept" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2qsG4AwKHP0" role="3cqZAp" />
           <node concept="3clFbF" id="4MaHsBE6r$X" role="3cqZAp">
             <node concept="2OqwBi" id="4MaHsBE6r$Y" role="3clFbG">
               <node concept="2YIFZM" id="4MaHsBE6r$Z" role="2Oq$k0">
@@ -1695,8 +1810,8 @@
               <node concept="liA8E" id="4MaHsBE6r_2" role="2OqNvi">
                 <ref role="37wK5l" to="31yc:4MaHsBDgiaT" resolve="handle" />
                 <node concept="2YIFZM" id="4MaHsBE6r_3" role="37wK5m">
-                  <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String)" resolve="createMessage" />
                   <ref role="1Pybhc" to="et5u:~Message" resolve="Message" />
+                  <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String,java.lang.Object)" resolve="createMessage" />
                   <node concept="Rm8GO" id="4MaHsBE6r_4" role="37wK5m">
                     <ref role="Rm8GQ" to="et5u:~MessageKind.INFORMATION" resolve="INFORMATION" />
                     <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
@@ -1710,8 +1825,8 @@
                     </node>
                   </node>
                   <node concept="3cpWs3" id="4MaHsBE6r_8" role="37wK5m">
-                    <node concept="37vLTw" id="4MaHsBE6wG1" role="3uHU7w">
-                      <ref role="3cqZAo" node="3KN3A4uAbNa" resolve="coerceTo" />
+                    <node concept="37vLTw" id="2qsG4AwKLIF" role="3uHU7w">
+                      <ref role="3cqZAo" node="2qsG4AwKIeJ" resolve="coerceTo" />
                     </node>
                     <node concept="3cpWs3" id="4MaHsBE6r_a" role="3uHU7B">
                       <node concept="3cpWs3" id="4MaHsBE6r_b" role="3uHU7B">
@@ -1737,13 +1852,17 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="37vLTw" id="2qsG4AwKMvI" role="37wK5m">
+                    <ref role="3cqZAo" node="2qsG4AwKIeE" resolve="to" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="2qsG4AwKOqM" role="3cqZAp" />
           <node concept="3clFbF" id="4pwDyRARaCS" role="3cqZAp">
-            <node concept="37vLTw" id="3KN3A4uAbNe" role="3clFbG">
-              <ref role="3cqZAo" node="3KN3A4uAbNa" resolve="coerceTo" />
+            <node concept="37vLTw" id="2qsG4AwKNqg" role="3clFbG">
+              <ref role="3cqZAo" node="2qsG4AwKIeJ" resolve="coerceTo" />
             </node>
           </node>
         </node>
@@ -1774,6 +1893,7 @@
           </node>
         </node>
         <node concept="3clFbS" id="hEDrw1P5M8" role="3clF47">
+          <node concept="3clFbH" id="2qsG4AwKOJU" role="3cqZAp" />
           <node concept="3clFbF" id="4MaHsBE6SoO" role="3cqZAp">
             <node concept="2OqwBi" id="4MaHsBE6SoP" role="3clFbG">
               <node concept="2YIFZM" id="4MaHsBE6SoQ" role="2Oq$k0">
@@ -1830,6 +1950,7 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="2qsG4AwKOW8" role="3cqZAp" />
           <node concept="3clFbF" id="hEDrw1P5Mb" role="3cqZAp">
             <node concept="10Nm6u" id="hEDrw1P5Ma" role="3clFbG" />
           </node>
@@ -1855,6 +1976,7 @@
         </node>
         <node concept="37vLTG" id="2Hyoxv0bBI" role="3clF46">
           <property role="TrG5h" value="consumer" />
+          <property role="3TUv4t" value="true" />
           <node concept="3uibUv" id="2Hyoxv0bBJ" role="1tU5fm">
             <ref role="3uigEE" to="82uw:~Consumer" resolve="Consumer" />
             <node concept="3qUtgH" id="2Hyoxv0bBK" role="11_B2D">
@@ -1865,6 +1987,160 @@
           </node>
         </node>
         <node concept="3clFbS" id="2Hyoxv0bBM" role="3clF47">
+          <node concept="3cpWs8" id="2qsG4AwKPDx" role="3cqZAp">
+            <node concept="3cpWsn" id="2qsG4AwKPDy" role="3cpWs9">
+              <property role="TrG5h" value="to" />
+              <node concept="3uibUv" id="2qsG4AwKPDz" role="1tU5fm">
+                <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+              </node>
+              <node concept="2ShNRf" id="2qsG4AwKPD$" role="33vP2m">
+                <node concept="HV5vD" id="2qsG4AwKPD_" role="2ShVmc">
+                  <ref role="HV5vE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="1oUwjADot3A" role="3cqZAp">
+            <node concept="3cpWsn" id="1oUwjADot3B" role="3cpWs9">
+              <property role="TrG5h" value="sink" />
+              <node concept="3uibUv" id="1oUwjADot3_" role="1tU5fm">
+                <ref role="3uigEE" to="1yqb:5KrJ7UHMRRs" resolve="ReportSink" />
+              </node>
+              <node concept="2ShNRf" id="1oUwjADot3C" role="33vP2m">
+                <node concept="YeOm9" id="1oUwjADot3D" role="2ShVmc">
+                  <node concept="1Y3b0j" id="1oUwjADot3E" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                    <ref role="1Y3XeK" to="1yqb:5KrJ7UHMRRs" resolve="ReportSink" />
+                    <node concept="3Tm1VV" id="1oUwjADot3F" role="1B3o_S" />
+                    <node concept="3clFb_" id="1oUwjADot3G" role="jymVt">
+                      <property role="TrG5h" value="report" />
+                      <node concept="37vLTG" id="1oUwjADot3H" role="3clF46">
+                        <property role="TrG5h" value="reportItem" />
+                        <node concept="3uibUv" id="1oUwjADot3I" role="1tU5fm">
+                          <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+                        </node>
+                      </node>
+                      <node concept="3cqZAl" id="1oUwjADot3J" role="3clF45" />
+                      <node concept="3Tm1VV" id="1oUwjADot3K" role="1B3o_S" />
+                      <node concept="3clFbS" id="1oUwjADot3L" role="3clF47">
+                        <node concept="3clFbJ" id="1oUwjADot3M" role="3cqZAp">
+                          <node concept="3clFbS" id="1oUwjADot3N" role="3clFbx">
+                            <node concept="3clFbF" id="1oUwjADot3O" role="3cqZAp">
+                              <node concept="2OqwBi" id="1oUwjADot3P" role="3clFbG">
+                                <node concept="37vLTw" id="2qsG4AwKTID" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2Hyoxv0bBI" resolve="consumer" />
+                                </node>
+                                <node concept="liA8E" id="1oUwjADot3R" role="2OqNvi">
+                                  <ref role="37wK5l" to="82uw:~Consumer.accept(java.lang.Object)" resolve="accept" />
+                                  <node concept="10QFUN" id="1oUwjADot3S" role="37wK5m">
+                                    <node concept="3uibUv" id="1oUwjADot3T" role="10QFUM">
+                                      <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                                    </node>
+                                    <node concept="37vLTw" id="1oUwjADot3U" role="10QFUP">
+                                      <ref role="3cqZAo" node="1oUwjADot3H" resolve="reportItem" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2ZW3vV" id="1oUwjADot3V" role="3clFbw">
+                            <node concept="3uibUv" id="1oUwjADot3W" role="2ZW6by">
+                              <ref role="3uigEE" to="d6hs:~NodeReportItem" resolve="NodeReportItem" />
+                            </node>
+                            <node concept="37vLTw" id="1oUwjADot3X" role="2ZW6bz">
+                              <ref role="3cqZAo" node="1oUwjADot3H" resolve="reportItem" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2AHcQZ" id="1oUwjADot3Y" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2qsG4AwKRZQ" role="3cqZAp" />
+          <node concept="3SKdUt" id="2qsG4AwLBYw" role="3cqZAp">
+            <node concept="1PaTwC" id="2qsG4AwLBYx" role="3ndbpf">
+              <node concept="3oM_SD" id="2qsG4AwLBYz" role="1PaTwD">
+                <property role="3oM_SC" value="FIXME:" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLCq7" role="1PaTwD">
+                <property role="3oM_SC" value="this" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLCqi" role="1PaTwD">
+                <property role="3oM_SC" value="must" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLCqu" role="1PaTwD">
+                <property role="3oM_SC" value="not" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLCqF" role="1PaTwD">
+                <property role="3oM_SC" value="be" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLCqL" role="1PaTwD">
+                <property role="3oM_SC" value="the" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLCqS" role="1PaTwD">
+                <property role="3oM_SC" value="containing" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLCr8" role="1PaTwD">
+                <property role="3oM_SC" value="root!" />
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="1oUwjADo$Xq" role="3cqZAp">
+            <node concept="3cpWsn" id="1oUwjADo$Xr" role="3cpWs9">
+              <property role="TrG5h" value="containingRoot" />
+              <node concept="3Tqbb2" id="1oUwjADo$SV" role="1tU5fm" />
+              <node concept="2OqwBi" id="1oUwjADoAIm" role="33vP2m">
+                <node concept="37vLTw" id="2qsG4AwLCRt" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2Hyoxv0bBG" resolve="node" />
+                </node>
+                <node concept="liA8E" id="2qsG4AwLDpf" role="2OqNvi">
+                  <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2qsG4AwKYP$" role="3cqZAp">
+            <node concept="2OqwBi" id="2qsG4AwKZwC" role="3clFbG">
+              <node concept="2OqwBi" id="2qsG4AwL2gk" role="2Oq$k0">
+                <node concept="2OqwBi" id="2qsG4AwL2gl" role="2Oq$k0">
+                  <node concept="2YIFZM" id="2qsG4AwL2gm" role="2Oq$k0">
+                    <ref role="37wK5l" to="tj24:3IIf9O_Z6Ip" resolve="forNode" />
+                    <ref role="1Pybhc" to="tj24:7kaxm0sEy3e" resolve="TypecheckingService" />
+                    <node concept="37vLTw" id="2qsG4AwL2gn" role="37wK5m">
+                      <ref role="3cqZAo" node="2Hyoxv0bBG" resolve="node" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="2qsG4AwL2go" role="2OqNvi">
+                    <ref role="37wK5l" to="tj24:1G9Y_Qvby8B" resolve="withTraceObject" />
+                    <node concept="37vLTw" id="2qsG4AwL2gp" role="37wK5m">
+                      <ref role="3cqZAo" node="2qsG4AwKPDy" resolve="to" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="2qsG4AwL2gq" role="2OqNvi">
+                  <ref role="37wK5l" to="tj24:5KrJ7UHN1Lk" resolve="withReportSink" />
+                  <node concept="37vLTw" id="2qsG4AwL2gr" role="37wK5m">
+                    <ref role="3cqZAo" node="1oUwjADot3B" resolve="sink" />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="2qsG4AwL01V" role="2OqNvi">
+                <ref role="37wK5l" to="tj24:1FOQehxdXIx" resolve="checkTypes" />
+                <node concept="37vLTw" id="2qsG4AwLEpJ" role="37wK5m">
+                  <ref role="3cqZAo" node="1oUwjADo$Xr" resolve="containingRoot" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2qsG4AwKPll" role="3cqZAp" />
           <node concept="3clFbF" id="4MaHsBE6CBx" role="3cqZAp">
             <node concept="2OqwBi" id="4MaHsBE6CBy" role="3clFbG">
               <node concept="2YIFZM" id="4MaHsBE6CBz" role="2Oq$k0">
@@ -1881,7 +2157,7 @@
                 <ref role="37wK5l" to="31yc:4MaHsBDgiaT" resolve="handle" />
                 <node concept="2YIFZM" id="4MaHsBE6CBB" role="37wK5m">
                   <ref role="1Pybhc" to="et5u:~Message" resolve="Message" />
-                  <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String)" resolve="createMessage" />
+                  <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String,java.lang.Object)" resolve="createMessage" />
                   <node concept="Rm8GO" id="4MaHsBE6CBC" role="37wK5m">
                     <ref role="Rm8GQ" to="et5u:~MessageKind.INFORMATION" resolve="INFORMATION" />
                     <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
@@ -1907,10 +2183,14 @@
                       <property role="Xl_RC" value=")" />
                     </node>
                   </node>
+                  <node concept="37vLTw" id="2qsG4AwL4i6" role="37wK5m">
+                    <ref role="3cqZAo" node="2qsG4AwKPDy" resolve="to" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="2qsG4AwKP16" role="3cqZAp" />
           <node concept="3clFbF" id="1oUwjADoC3X" role="3cqZAp">
             <node concept="2YIFZM" id="1oUwjADoC7W" role="3clFbG">
               <ref role="37wK5l" to="tj24:1oUwjADoavi" resolve="checkRoot" />
@@ -1939,11 +2219,80 @@
             <ref role="3uigEE" to="mhbf:~SNode" resolve="SNode" />
           </node>
         </node>
-        <node concept="3clFbS" id="6l3eCxofJGT" role="3clF47" />
+        <node concept="3clFbS" id="6l3eCxofJGT" role="3clF47">
+          <node concept="3SKdUt" id="2qsG4AwLTT$" role="3cqZAp">
+            <node concept="1PaTwC" id="2qsG4AwLTT_" role="3ndbpf">
+              <node concept="3oM_SD" id="2qsG4AwLTTB" role="1PaTwD">
+                <property role="3oM_SC" value="TODO:" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLTU0" role="1PaTwD">
+                <property role="3oM_SC" value="introduce" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLU2Z" role="1PaTwD">
+                <property role="3oM_SC" value="a" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLU4U" role="1PaTwD">
+                <property role="3oM_SC" value="flag" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="2qsG4AwLyh2" role="3cqZAp">
+            <node concept="3clFbS" id="2qsG4AwLyh4" role="3clFbx">
+              <node concept="3clFbF" id="2qsG4AwL68J" role="3cqZAp">
+                <node concept="2OqwBi" id="2qsG4AwL68K" role="3clFbG">
+                  <node concept="2YIFZM" id="2qsG4AwL68L" role="2Oq$k0">
+                    <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                    <ref role="37wK5l" to="31yc:4MaHsBDdmcG" resolve="get" />
+                    <node concept="37vLTw" id="2qsG4AwL68M" role="37wK5m">
+                      <ref role="3cqZAo" node="4MaHsBDeL9t" resolve="mpsProject" />
+                    </node>
+                    <node concept="Xl_RD" id="2qsG4AwL68N" role="37wK5m">
+                      <property role="Xl_RC" value="Typechecking" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="2qsG4AwL68O" role="2OqNvi">
+                    <ref role="37wK5l" to="31yc:4MaHsBDgiaT" resolve="handle" />
+                    <node concept="2YIFZM" id="2qsG4AwL68P" role="37wK5m">
+                      <ref role="1Pybhc" to="et5u:~Message" resolve="Message" />
+                      <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String)" resolve="createMessage" />
+                      <node concept="Rm8GO" id="2qsG4AwL68Q" role="37wK5m">
+                        <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+                        <ref role="Rm8GQ" to="et5u:~MessageKind.WARNING" resolve="WARNING" />
+                      </node>
+                      <node concept="2OqwBi" id="2qsG4AwL68R" role="37wK5m">
+                        <node concept="3VsKOn" id="2qsG4AwL68S" role="2Oq$k0">
+                          <ref role="3VsUkX" node="5BwsbZJE17w" resolve="CoderulesTypecheckingProvider.Queries" />
+                        </node>
+                        <node concept="liA8E" id="2qsG4AwL68T" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
+                        </node>
+                      </node>
+                      <node concept="3cpWs3" id="2qsG4AwL68U" role="37wK5m">
+                        <node concept="3cpWs3" id="2qsG4AwL68Y" role="3uHU7B">
+                          <node concept="Xl_RD" id="2qsG4AwL68Z" role="3uHU7B">
+                            <property role="Xl_RC" value="NOT IMPLEMENTED: clearCache" />
+                          </node>
+                          <node concept="37vLTw" id="2qsG4AwL7yW" role="3uHU7w">
+                            <ref role="3cqZAo" node="6l3eCxofJGR" resolve="node" />
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="2qsG4AwL692" role="3uHU7w">
+                          <property role="Xl_RC" value=")" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbT" id="2qsG4AwLyCv" role="3clFbw" />
+          </node>
+        </node>
         <node concept="2AHcQZ" id="6l3eCxofJGU" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
+      <node concept="2tJIrI" id="2qsG4AwL4R$" role="jymVt" />
       <node concept="3clFb_" id="6l3eCxofJGV" role="jymVt">
         <property role="TrG5h" value="isCacheUpToDate" />
         <node concept="3Tm1VV" id="6l3eCxofJGW" role="1B3o_S" />
@@ -1955,6 +2304,74 @@
           </node>
         </node>
         <node concept="3clFbS" id="6l3eCxofJH1" role="3clF47">
+          <node concept="3SKdUt" id="2qsG4AwLUCj" role="3cqZAp">
+            <node concept="1PaTwC" id="2qsG4AwLUCk" role="3ndbpf">
+              <node concept="3oM_SD" id="2qsG4AwLUCm" role="1PaTwD">
+                <property role="3oM_SC" value="TODO:" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLULI" role="1PaTwD">
+                <property role="3oM_SC" value="introduce" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLULT" role="1PaTwD">
+                <property role="3oM_SC" value="a" />
+              </node>
+              <node concept="3oM_SD" id="2qsG4AwLULX" role="1PaTwD">
+                <property role="3oM_SC" value="flag" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbJ" id="2qsG4AwLwgs" role="3cqZAp">
+            <node concept="3clFbS" id="2qsG4AwLwgu" role="3clFbx">
+              <node concept="3clFbF" id="2qsG4AwL8lq" role="3cqZAp">
+                <node concept="2OqwBi" id="2qsG4AwL8lr" role="3clFbG">
+                  <node concept="2YIFZM" id="2qsG4AwL8ls" role="2Oq$k0">
+                    <ref role="1Pybhc" to="31yc:4MaHsBDdlvx" resolve="MessageLog" />
+                    <ref role="37wK5l" to="31yc:4MaHsBDdmcG" resolve="get" />
+                    <node concept="37vLTw" id="2qsG4AwL8lt" role="37wK5m">
+                      <ref role="3cqZAo" node="4MaHsBDeL9t" resolve="mpsProject" />
+                    </node>
+                    <node concept="Xl_RD" id="2qsG4AwL8lu" role="37wK5m">
+                      <property role="Xl_RC" value="Typechecking" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="2qsG4AwL8lv" role="2OqNvi">
+                    <ref role="37wK5l" to="31yc:4MaHsBDgiaT" resolve="handle" />
+                    <node concept="2YIFZM" id="2qsG4AwL8lw" role="37wK5m">
+                      <ref role="1Pybhc" to="et5u:~Message" resolve="Message" />
+                      <ref role="37wK5l" to="et5u:~Message.createMessage(jetbrains.mps.messages.MessageKind,java.lang.String,java.lang.String)" resolve="createMessage" />
+                      <node concept="Rm8GO" id="2qsG4AwL8lx" role="37wK5m">
+                        <ref role="Rm8GQ" to="et5u:~MessageKind.WARNING" resolve="WARNING" />
+                        <ref role="1Px2BO" to="et5u:~MessageKind" resolve="MessageKind" />
+                      </node>
+                      <node concept="2OqwBi" id="2qsG4AwL8ly" role="37wK5m">
+                        <node concept="3VsKOn" id="2qsG4AwL8lz" role="2Oq$k0">
+                          <ref role="3VsUkX" node="5BwsbZJE17w" resolve="CoderulesTypecheckingProvider.Queries" />
+                        </node>
+                        <node concept="liA8E" id="2qsG4AwL8l$" role="2OqNvi">
+                          <ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
+                        </node>
+                      </node>
+                      <node concept="3cpWs3" id="2qsG4AwL8l_" role="37wK5m">
+                        <node concept="3cpWs3" id="2qsG4AwL8lA" role="3uHU7B">
+                          <node concept="Xl_RD" id="2qsG4AwL8lB" role="3uHU7B">
+                            <property role="Xl_RC" value="NOT IMPLEMENTED: isCacheUpToDate" />
+                          </node>
+                          <node concept="37vLTw" id="2qsG4AwL8lC" role="3uHU7w">
+                            <ref role="3cqZAo" node="6l3eCxofJGZ" resolve="node" />
+                          </node>
+                        </node>
+                        <node concept="Xl_RD" id="2qsG4AwL8lD" role="3uHU7w">
+                          <property role="Xl_RC" value=")" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbT" id="2qsG4AwLwBW" role="3clFbw" />
+          </node>
+          <node concept="3clFbH" id="2qsG4AwL8lm" role="3cqZAp" />
           <node concept="3clFbF" id="6l3eCxofJH4" role="3cqZAp">
             <node concept="3clFbT" id="6l3eCxofJH3" role="3clFbG" />
           </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 289a4f81..8e9410f3 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -55,6 +55,8 @@
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
     <import index="z9ve" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.core.internal(jetbrains.mps.logic.reactor/)" />
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
+    <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
+    <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -3747,6 +3749,68 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1G9Y_Qv7w66" role="jymVt" />
+    <node concept="Wx3nA" id="1G9Y_Qv7rZx" role="jymVt">
+      <property role="TrG5h" value="TRACE_EVENTS" />
+      <node concept="3Tm1VV" id="1G9Y_Qv7rZy" role="1B3o_S" />
+      <node concept="3uibUv" id="1G9Y_Qv7rZz" role="1tU5fm">
+        <ref role="3uigEE" to="1yqb:2daneBOYiP$" resolve="Effect.ClassValueKind" />
+        <node concept="3uibUv" id="1G9Y_Qv8VKM" role="11_B2D">
+          <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="1G9Y_Qv7rZ_" role="33vP2m">
+        <node concept="YeOm9" id="1G9Y_Qv7rZA" role="2ShVmc">
+          <node concept="1Y3b0j" id="1G9Y_Qv7rZB" role="YeSDq">
+            <property role="2bfB8j" value="true" />
+            <ref role="37wK5l" to="1yqb:2daneBOYlrK" resolve="Effect.ClassValueKind" />
+            <ref role="1Y3XeK" to="1yqb:2daneBOYiP$" resolve="Effect.ClassValueKind" />
+            <node concept="3Tm1VV" id="1G9Y_Qv7rZC" role="1B3o_S" />
+            <node concept="3VsKOn" id="1G9Y_Qv7rZD" role="37wK5m">
+              <ref role="3VsUkX" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+            </node>
+            <node concept="3clFb_" id="1G9Y_Qv7rZE" role="jymVt">
+              <property role="TrG5h" value="extractValue" />
+              <node concept="37vLTG" id="1G9Y_Qv7rZF" role="3clF46">
+                <property role="TrG5h" value="eff" />
+                <node concept="3uibUv" id="1G9Y_Qv7rZG" role="1tU5fm">
+                  <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                </node>
+              </node>
+              <node concept="3uibUv" id="1G9Y_Qv7Dca" role="3clF45">
+                <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+              </node>
+              <node concept="3Tm1VV" id="1G9Y_Qv7rZI" role="1B3o_S" />
+              <node concept="3clFbS" id="1G9Y_Qv7rZJ" role="3clF47">
+                <node concept="3clFbF" id="1G9Y_Qv7rZK" role="3cqZAp">
+                  <node concept="2OqwBi" id="1G9Y_Qv7rZL" role="3clFbG">
+                    <node concept="1eOMI4" id="1G9Y_Qv7rZM" role="2Oq$k0">
+                      <node concept="10QFUN" id="1G9Y_Qv7rZN" role="1eOMHV">
+                        <node concept="3uibUv" id="1G9Y_Qv7rZO" role="10QFUM">
+                          <ref role="3uigEE" node="2daneBP0KUh" resolve="TypecheckingStep.LocalEffect" />
+                        </node>
+                        <node concept="37vLTw" id="1G9Y_Qv7rZP" role="10QFUP">
+                          <ref role="3cqZAo" node="1G9Y_Qv7rZF" resolve="eff" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OwXpG" id="1G9Y_Qv8VyK" role="2OqNvi">
+                      <ref role="2Oxat5" node="1G9Y_Qv8TbJ" resolve="traceEventsCollector" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2AHcQZ" id="1G9Y_Qv7rZR" role="2AJF6D">
+                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+              </node>
+            </node>
+            <node concept="3uibUv" id="1G9Y_Qv7CgG" role="2Ghqu4">
+              <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="2daneBP0Sri" role="jymVt" />
     <node concept="Wx3nA" id="2daneBPzfwl" role="jymVt">
       <property role="TrG5h" value="LOCAL_TYPES" />
@@ -3885,6 +3949,12 @@
             <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
           </node>
         </node>
+        <node concept="37vLTG" id="1G9Y_Qv8QFZ" role="3clF46">
+          <property role="TrG5h" value="traceEventsCollector" />
+          <node concept="3uibUv" id="1G9Y_Qv8RMY" role="1tU5fm">
+            <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+          </node>
+        </node>
         <node concept="37vLTG" id="2daneBPUa9E" role="3clF46">
           <property role="TrG5h" value="localTypes" />
           <node concept="3rvAFt" id="2daneBPUaMI" role="1tU5fm">
@@ -3942,6 +4012,19 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="1G9Y_Qv8TbN" role="3cqZAp">
+            <node concept="37vLTI" id="1G9Y_Qv8TbP" role="3clFbG">
+              <node concept="2OqwBi" id="1G9Y_Qv8UCd" role="37vLTJ">
+                <node concept="Xjq3P" id="1G9Y_Qv8UOv" role="2Oq$k0" />
+                <node concept="2OwXpG" id="1G9Y_Qv8UCg" role="2OqNvi">
+                  <ref role="2Oxat5" node="1G9Y_Qv8TbJ" resolve="traceEventsCollector" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="1G9Y_Qv8TbT" role="37vLTx">
+                <ref role="3cqZAo" node="1G9Y_Qv8QFZ" resolve="traceEventsCollector" />
+              </node>
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="2daneBPTWiR" role="jymVt" />
@@ -3975,12 +4058,22 @@
                 </node>
               </node>
               <node concept="22lmx$" id="2daneBP$0N6" role="3uHU7B">
-                <node concept="3clFbC" id="2daneBPzZK1" role="3uHU7B">
-                  <node concept="37vLTw" id="2daneBPzZmK" role="3uHU7B">
-                    <ref role="3cqZAo" node="2daneBP0RaA" resolve="valueKind" />
+                <node concept="22lmx$" id="1G9Y_Qv8Wv9" role="3uHU7B">
+                  <node concept="3clFbC" id="1G9Y_Qv8YeL" role="3uHU7w">
+                    <node concept="37vLTw" id="1G9Y_Qv8YL7" role="3uHU7w">
+                      <ref role="3cqZAo" node="1G9Y_Qv7rZx" resolve="TRACE_EVENTS" />
+                    </node>
+                    <node concept="37vLTw" id="1G9Y_Qv8XHa" role="3uHU7B">
+                      <ref role="3cqZAo" node="2daneBP0RaA" resolve="valueKind" />
+                    </node>
                   </node>
-                  <node concept="37vLTw" id="2daneBP$02M" role="3uHU7w">
-                    <ref role="3cqZAo" node="2daneBPzfwl" resolve="LOCAL_TYPES" />
+                  <node concept="3clFbC" id="2daneBPzZK1" role="3uHU7B">
+                    <node concept="37vLTw" id="2daneBPzZmK" role="3uHU7B">
+                      <ref role="3cqZAo" node="2daneBP0RaA" resolve="valueKind" />
+                    </node>
+                    <node concept="37vLTw" id="2daneBP$02M" role="3uHU7w">
+                      <ref role="3cqZAo" node="2daneBPzfwl" resolve="LOCAL_TYPES" />
+                    </node>
                   </node>
                 </node>
                 <node concept="3clFbC" id="2daneBP$1St" role="3uHU7w">
@@ -4040,6 +4133,13 @@
           </node>
         </node>
       </node>
+      <node concept="312cEg" id="1G9Y_Qv8TbJ" role="jymVt">
+        <property role="TrG5h" value="traceEventsCollector" />
+        <node concept="3Tm6S6" id="1G9Y_Qv8TbK" role="1B3o_S" />
+        <node concept="3uibUv" id="1G9Y_Qv8TbM" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="2daneBPzfwk" role="jymVt" />
     <node concept="3clFbW" id="NKt6yn84NI" role="jymVt">
@@ -4153,12 +4253,170 @@
       <node concept="3Tmbuc" id="78H58of4zUa" role="1B3o_S" />
       <node concept="3clFbS" id="78H58of4zYm" role="3clF47">
         <node concept="3clFbH" id="2daneBPUNeL" role="3cqZAp" />
+        <node concept="3cpWs8" id="1G9Y_Qv8cvi" role="3cqZAp">
+          <node concept="3cpWsn" id="1G9Y_Qv8cvj" role="3cpWs9">
+            <property role="TrG5h" value="traceEventsCollector" />
+            <node concept="3uibUv" id="1G9Y_Qv8cfL" role="1tU5fm">
+              <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+            </node>
+            <node concept="10Nm6u" id="1G9Y_Qv8hpm" role="33vP2m" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="1G9Y_Qv8fM5" role="3cqZAp" />
+        <node concept="3cpWs8" id="1G9Y_Qv8wB4" role="3cqZAp">
+          <node concept="3cpWsn" id="1G9Y_Qv8wB5" role="3cpWs9">
+            <property role="TrG5h" value="input_trace_collector" />
+            <node concept="3uibUv" id="1G9Y_Qv8w7O" role="1tU5fm">
+              <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
+              <node concept="1LlUBW" id="1G9Y_Qv8w89" role="11_B2D">
+                <node concept="3uibUv" id="1G9Y_Qv8w8a" role="1Lm7xW">
+                  <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                  <node concept="3uibUv" id="1G9Y_Qv8w8b" role="11_B2D">
+                    <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                    <node concept="3qUE_q" id="1G9Y_Qv8Ipg" role="11_B2D">
+                      <node concept="3uibUv" id="1G9Y_Qv8Iph" role="3qUE_r">
+                        <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3uibUv" id="1G9Y_Qv8zWY" role="1Lm7xW">
+                  <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="1G9Y_Qv8wB6" role="33vP2m">
+              <node concept="37vLTw" id="1G9Y_Qv8wB7" role="2Oq$k0">
+                <ref role="3cqZAo" node="78H58of4zU1" resolve="input_trace" />
+              </node>
+              <node concept="liA8E" id="1G9Y_Qv8wB8" role="2OqNvi">
+                <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
+                <node concept="1bVj0M" id="1G9Y_Qv8wB9" role="37wK5m">
+                  <node concept="37vLTG" id="1G9Y_Qv8wBa" role="1bW2Oz">
+                    <property role="TrG5h" value="inEff_trace" />
+                    <node concept="1LlUBW" id="1G9Y_Qv8wBb" role="1tU5fm">
+                      <node concept="3uibUv" id="1G9Y_Qv8wBc" role="1Lm7xW">
+                        <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                        <node concept="3uibUv" id="1G9Y_Qv8wBd" role="11_B2D">
+                          <ref role="3uigEE" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                          <node concept="3qUE_q" id="1G9Y_Qv8KlG" role="11_B2D">
+                            <node concept="3uibUv" id="1G9Y_Qv8KlH" role="3qUE_r">
+                              <ref role="3uigEE" to="fqlx:NKt6yomNZE" resolve="CoderulesAspect" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3uibUv" id="1G9Y_Qv8wBf" role="1Lm7xW">
+                        <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="1G9Y_Qv8wBg" role="1bW5cS">
+                    <node concept="3clFbH" id="1G9Y_Qv8wBh" role="3cqZAp" />
+                    <node concept="3cpWs8" id="1G9Y_Qv8wBi" role="3cqZAp">
+                      <node concept="3cpWsn" id="1G9Y_Qv8wBj" role="3cpWs9">
+                        <property role="TrG5h" value="program" />
+                        <node concept="3uibUv" id="1G9Y_Qv8wBk" role="1tU5fm">
+                          <ref role="3uigEE" to="av0y:~Program" resolve="Program" />
+                        </node>
+                        <node concept="2OqwBi" id="1G9Y_Qv8wBl" role="33vP2m">
+                          <node concept="2OqwBi" id="1G9Y_Qv8wBm" role="2Oq$k0">
+                            <node concept="liA8E" id="1G9Y_Qv8wBn" role="2OqNvi">
+                              <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                              <node concept="10M0yZ" id="1G9Y_Qv8wBo" role="37wK5m">
+                                <ref role="3cqZAo" to="1yqb:2daneBPSu1V" resolve="PROGRAM_PRODUCER" />
+                                <ref role="1PxDUh" to="1yqb:1pPth$lAwc0" resolve="ApplyTemplatesStep" />
+                              </node>
+                            </node>
+                            <node concept="1LFfDK" id="1G9Y_Qv8wBp" role="2Oq$k0">
+                              <node concept="3cmrfG" id="1G9Y_Qv8wBq" role="1LF_Uc">
+                                <property role="3cmrfH" value="0" />
+                              </node>
+                              <node concept="37vLTw" id="1G9Y_Qv8wBr" role="1LFl5Q">
+                                <ref role="3cqZAo" node="1G9Y_Qv8wBa" resolve="inEff_trace" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="1G9Y_Qv8wBs" role="2OqNvi">
+                            <ref role="37wK5l" to="hano:3GlpCDSyO$P" resolve="getProgram" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="1G9Y_Qv8wBt" role="3cqZAp">
+                      <node concept="37vLTI" id="1G9Y_Qv8wBu" role="3clFbG">
+                        <node concept="2ShNRf" id="1G9Y_Qv8wBv" role="37vLTx">
+                          <node concept="1pGfFk" id="1G9Y_Qv8wBw" role="2ShVmc">
+                            <ref role="37wK5l" to="31yc:2daneBOSyP4" resolve="TraceEventsCollector" />
+                            <node concept="2OqwBi" id="1G9Y_Qv8wBx" role="37wK5m">
+                              <node concept="37vLTw" id="1G9Y_Qv8wBy" role="2Oq$k0">
+                                <ref role="3cqZAo" node="1G9Y_Qv8wBj" resolve="program" />
+                              </node>
+                              <node concept="liA8E" id="1G9Y_Qv8wBz" role="2OqNvi">
+                                <ref role="37wK5l" to="av0y:~Program.name()" resolve="name" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="1G9Y_Qv8wB$" role="37vLTJ">
+                          <ref role="3cqZAo" node="1G9Y_Qv8cvj" resolve="traceEventsCollector" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="1G9Y_Qv8wB_" role="3cqZAp" />
+                    <node concept="3clFbF" id="1G9Y_Qv8wBA" role="3cqZAp">
+                      <node concept="1Ls8ON" id="1G9Y_Qv8wBB" role="3clFbG">
+                        <node concept="1LFfDK" id="1G9Y_Qv8wBC" role="1Lso8e">
+                          <node concept="3cmrfG" id="1G9Y_Qv8wBD" role="1LF_Uc">
+                            <property role="3cmrfH" value="0" />
+                          </node>
+                          <node concept="37vLTw" id="1G9Y_Qv8wBE" role="1LFl5Q">
+                            <ref role="3cqZAo" node="1G9Y_Qv8wBa" resolve="inEff_trace" />
+                          </node>
+                        </node>
+                        <node concept="1eOMI4" id="1G9Y_Qv9cWS" role="1Lso8e">
+                          <node concept="10QFUN" id="1G9Y_Qv9cWT" role="1eOMHV">
+                            <node concept="2ShNRf" id="1G9Y_Qv9cWK" role="10QFUP">
+                              <node concept="1pGfFk" id="1G9Y_Qv9cWL" role="2ShVmc">
+                                <ref role="37wK5l" to="1yqb:7nPD14NbIzp" resolve="MultiTrace" />
+                                <node concept="2OqwBi" id="1G9Y_Qv9cWM" role="37wK5m">
+                                  <node concept="37vLTw" id="1G9Y_Qv9cWN" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="1G9Y_Qv8cvj" resolve="traceEventsCollector" />
+                                  </node>
+                                  <node concept="liA8E" id="1G9Y_Qv9cWO" role="2OqNvi">
+                                    <ref role="37wK5l" to="31yc:YGS68MEx_L" resolve="trace" />
+                                  </node>
+                                </node>
+                                <node concept="1LFfDK" id="1G9Y_Qv9cWP" role="37wK5m">
+                                  <node concept="3cmrfG" id="1G9Y_Qv9cWQ" role="1LF_Uc">
+                                    <property role="3cmrfH" value="1" />
+                                  </node>
+                                  <node concept="37vLTw" id="1G9Y_Qv9cWR" role="1LFl5Q">
+                                    <ref role="3cqZAo" node="1G9Y_Qv8wBa" resolve="inEff_trace" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3uibUv" id="1G9Y_Qv9enY" role="10QFUM">
+                              <ref role="3uigEE" to="hano:qubcdtxBiR" resolve="EvaluationTraceExt" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1G9Y_Qv8GS5" role="3cqZAp" />
         <node concept="3clFbF" id="78H58of4JwC" role="3cqZAp">
           <node concept="2OqwBi" id="78H58of4N2x" role="3clFbG">
             <node concept="3nyPlj" id="78H58of4JwA" role="2Oq$k0">
               <ref role="37wK5l" to="1yqb:55Q$YFtHM07" resolve="scheduleWithTrace" />
-              <node concept="37vLTw" id="78H58of4KA7" role="37wK5m">
-                <ref role="3cqZAo" node="78H58of4zU1" resolve="input_trace" />
+              <node concept="37vLTw" id="1G9Y_Qv8CWa" role="37wK5m">
+                <ref role="3cqZAo" node="1G9Y_Qv8wB5" resolve="input_trace_collector" />
               </node>
               <node concept="37vLTw" id="78H58of4Mnl" role="37wK5m">
                 <ref role="3cqZAo" node="78H58of4zU6" resolve="subscribeScheduler" />
@@ -4256,6 +4514,9 @@
                             <node concept="37vLTw" id="3bpBM3Q7XB0" role="37wK5m">
                               <ref role="3cqZAo" node="3bpBM3Q7U5R" resolve="updateCachedTypesIndex" />
                             </node>
+                            <node concept="37vLTw" id="1G9Y_Qv90by" role="37wK5m">
+                              <ref role="3cqZAo" node="1G9Y_Qv8cvj" resolve="traceEventsCollector" />
+                            </node>
                             <node concept="37vLTw" id="2daneBPUYxT" role="37wK5m">
                               <ref role="3cqZAo" node="7lt0LtQ_Xx_" resolve="typeNodes" />
                             </node>
@@ -4661,117 +4922,17 @@
       <node concept="10P_77" id="3IIf9OA4ZSv" role="3clF45" />
       <node concept="3Tm1VV" id="3IIf9OA4ZMG" role="1B3o_S" />
       <node concept="3clFbS" id="3IIf9OA4ZMH" role="3clF47">
-        <node concept="3cpWs8" id="2BZXJecYEPE" role="3cqZAp">
-          <node concept="3cpWsn" id="2BZXJecYEPF" role="3cpWs9">
-            <property role="TrG5h" value="tf1" />
-            <node concept="3uibUv" id="2BZXJecYEPD" role="1tU5fm">
-              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-            </node>
-            <node concept="2YIFZM" id="2BZXJecYEPG" role="33vP2m">
-              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
-              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-              <node concept="37vLTw" id="2BZXJecYEPH" role="37wK5m">
-                <ref role="3cqZAo" node="3IIf9OA507H" resolve="from" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2BZXJecYF1w" role="3cqZAp">
-          <node concept="3cpWsn" id="2BZXJecYF1x" role="3cpWs9">
-            <property role="TrG5h" value="tf2" />
-            <node concept="3uibUv" id="2BZXJecYF1y" role="1tU5fm">
-              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-            </node>
-            <node concept="2YIFZM" id="2BZXJecYF1z" role="33vP2m">
-              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
-              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-              <node concept="37vLTw" id="2BZXJecYF8X" role="37wK5m">
-                <ref role="3cqZAo" node="3IIf9OA50dD" resolve="to" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2BZXJecYEYG" role="3cqZAp" />
-        <node concept="3clFbJ" id="2BZXJecYFfj" role="3cqZAp">
-          <node concept="3clFbS" id="2BZXJecYFfl" role="3clFbx">
-            <node concept="YS8fn" id="2BZXJecYF$r" role="3cqZAp">
-              <node concept="2ShNRf" id="2BZXJecYFBb" role="YScLw">
-                <node concept="1pGfFk" id="2BZXJecYG7J" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
-                  <node concept="Xl_RD" id="2BZXJecYGd3" role="37wK5m">
-                    <property role="Xl_RC" value="repositories differ" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="2BZXJecYFsX" role="3clFbw">
-            <node concept="2OqwBi" id="2BZXJecYNcX" role="3uHU7w">
-              <node concept="37vLTw" id="2BZXJecYFxo" role="2Oq$k0">
-                <ref role="3cqZAo" node="2BZXJecYF1x" resolve="tf2" />
-              </node>
-              <node concept="2OwXpG" id="2BZXJecYNqv" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="2BZXJecYMEr" role="3uHU7B">
-              <node concept="37vLTw" id="2BZXJecYFkb" role="2Oq$k0">
-                <ref role="3cqZAo" node="2BZXJecYEPF" resolve="tf1" />
-              </node>
-              <node concept="2OwXpG" id="2BZXJecYN5F" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1FOQehxpElQ" role="3cqZAp" />
-        <node concept="3SKdUt" id="1FOQehxpDnl" role="3cqZAp">
-          <node concept="1PaTwC" id="589APehYyiG" role="3ndbpf">
-            <node concept="3oM_SD" id="589APehYyiH" role="1PaTwD">
-              <property role="3oM_SC" value="ensure" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiI" role="1PaTwD">
-              <property role="3oM_SC" value="we" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiJ" role="1PaTwD">
-              <property role="3oM_SC" value="can" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiK" role="1PaTwD">
-              <property role="3oM_SC" value="read" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiL" role="1PaTwD">
-              <property role="3oM_SC" value="the" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyiM" role="1PaTwD">
-              <property role="3oM_SC" value="model" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1FOQehxpDnn" role="3cqZAp">
-          <node concept="2OqwBi" id="1FOQehxpDno" role="3clFbG">
-            <node concept="2OqwBi" id="1FOQehxpDnp" role="2Oq$k0">
-              <node concept="2OqwBi" id="1FOQehxpDPn" role="2Oq$k0">
-                <node concept="37vLTw" id="1FOQehxpDCR" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2BZXJecYEPF" resolve="tf1" />
-                </node>
-                <node concept="2OwXpG" id="1FOQehxpEf9" role="2OqNvi">
-                  <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
-              </node>
-              <node concept="liA8E" id="1FOQehxpDnr" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
-              </node>
-            </node>
-            <node concept="liA8E" id="1FOQehxpDns" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2BZXJecYEYT" role="3cqZAp" />
         <node concept="3clFbF" id="2BZXJecYDs_" role="3cqZAp">
           <node concept="2OqwBi" id="2BZXJecYDsA" role="3clFbG">
-            <node concept="37vLTw" id="2BZXJecYEPI" role="2Oq$k0">
-              <ref role="3cqZAo" node="2BZXJecYEPF" resolve="tf1" />
+            <node concept="2YIFZM" id="2qsG4AwJq5l" role="2Oq$k0">
+              <ref role="37wK5l" node="2qsG4AwIYLn" resolve="for2Node" />
+              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+              <node concept="37vLTw" id="2qsG4AwJrGp" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9OA507H" resolve="from" />
+              </node>
+              <node concept="37vLTw" id="2qsG4AwJrQF" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9OA50dD" resolve="to" />
+              </node>
             </node>
             <node concept="liA8E" id="2BZXJecYDsD" role="2OqNvi">
               <ref role="37wK5l" node="3IIf9OAgpFT" resolve="calcConverts" />
@@ -4807,118 +4968,8 @@
       <node concept="3Tqbb2" id="4pwDyRAVDGz" role="3clF45" />
       <node concept="3Tm1VV" id="7Bx7XgEibEK" role="1B3o_S" />
       <node concept="3clFbS" id="7Bx7XgEibEL" role="3clF47">
-        <node concept="3cpWs8" id="7Bx7XgEibEM" role="3cqZAp">
-          <node concept="3cpWsn" id="7Bx7XgEibEN" role="3cpWs9">
-            <property role="TrG5h" value="tf1" />
-            <node concept="3uibUv" id="7Bx7XgEibEO" role="1tU5fm">
-              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-            </node>
-            <node concept="2YIFZM" id="7Bx7XgEibEP" role="33vP2m">
-              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
-              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-              <node concept="37vLTw" id="7Bx7XgEibEQ" role="37wK5m">
-                <ref role="3cqZAo" node="7Bx7XgEibEF" resolve="source" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="7Bx7XgEibER" role="3cqZAp">
-          <node concept="3cpWsn" id="7Bx7XgEibES" role="3cpWs9">
-            <property role="TrG5h" value="tf2" />
-            <node concept="3uibUv" id="7Bx7XgEibET" role="1tU5fm">
-              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-            </node>
-            <node concept="2YIFZM" id="7Bx7XgEioRC" role="33vP2m">
-              <ref role="37wK5l" node="7Bx7XgEii_q" resolve="forConcept" />
-              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
-              <node concept="37vLTw" id="7Bx7XgEioRD" role="37wK5m">
-                <ref role="3cqZAo" node="7Bx7XgEibEH" resolve="target" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7Bx7XgEibEW" role="3cqZAp" />
-        <node concept="3clFbJ" id="7Bx7XgEibEX" role="3cqZAp">
-          <node concept="3clFbS" id="7Bx7XgEibEY" role="3clFbx">
-            <node concept="YS8fn" id="7Bx7XgEibEZ" role="3cqZAp">
-              <node concept="2ShNRf" id="7Bx7XgEibF0" role="YScLw">
-                <node concept="1pGfFk" id="7Bx7XgEibF1" role="2ShVmc">
-                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
-                  <node concept="Xl_RD" id="7Bx7XgEibF2" role="37wK5m">
-                    <property role="Xl_RC" value="repositories differ" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3y3z36" id="7Bx7XgEibF3" role="3clFbw">
-            <node concept="2OqwBi" id="7Bx7XgEibF4" role="3uHU7w">
-              <node concept="37vLTw" id="7Bx7XgEibF5" role="2Oq$k0">
-                <ref role="3cqZAo" node="7Bx7XgEibES" resolve="tf2" />
-              </node>
-              <node concept="2OwXpG" id="7Bx7XgEibF6" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="7Bx7XgEibF7" role="3uHU7B">
-              <node concept="37vLTw" id="7Bx7XgEibF8" role="2Oq$k0">
-                <ref role="3cqZAo" node="7Bx7XgEibEN" resolve="tf1" />
-              </node>
-              <node concept="2OwXpG" id="7Bx7XgEibF9" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7Bx7XgEibFa" role="3cqZAp" />
-        <node concept="3SKdUt" id="7Bx7XgEibFb" role="3cqZAp">
-          <node concept="1PaTwC" id="7Bx7XgEibFc" role="3ndbpf">
-            <node concept="3oM_SD" id="7Bx7XgEibFd" role="1PaTwD">
-              <property role="3oM_SC" value="ensure" />
-            </node>
-            <node concept="3oM_SD" id="7Bx7XgEibFe" role="1PaTwD">
-              <property role="3oM_SC" value="we" />
-            </node>
-            <node concept="3oM_SD" id="7Bx7XgEibFf" role="1PaTwD">
-              <property role="3oM_SC" value="can" />
-            </node>
-            <node concept="3oM_SD" id="7Bx7XgEibFg" role="1PaTwD">
-              <property role="3oM_SC" value="read" />
-            </node>
-            <node concept="3oM_SD" id="7Bx7XgEibFh" role="1PaTwD">
-              <property role="3oM_SC" value="the" />
-            </node>
-            <node concept="3oM_SD" id="7Bx7XgEibFi" role="1PaTwD">
-              <property role="3oM_SC" value="model" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7Bx7XgEibFj" role="3cqZAp">
-          <node concept="2OqwBi" id="7Bx7XgEibFk" role="3clFbG">
-            <node concept="2OqwBi" id="7Bx7XgEibFl" role="2Oq$k0">
-              <node concept="2OqwBi" id="7Bx7XgEibFm" role="2Oq$k0">
-                <node concept="37vLTw" id="7Bx7XgEibFn" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7Bx7XgEibEN" resolve="tf1" />
-                </node>
-                <node concept="2OwXpG" id="7Bx7XgEibFo" role="2OqNvi">
-                  <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-                </node>
-              </node>
-              <node concept="liA8E" id="7Bx7XgEibFp" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
-              </node>
-            </node>
-            <node concept="liA8E" id="7Bx7XgEibFq" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7Bx7XgEibFr" role="3cqZAp" />
         <node concept="3clFbF" id="7Bx7XgEibFs" role="3cqZAp">
           <node concept="2OqwBi" id="7Bx7XgEibFt" role="3clFbG">
-            <node concept="37vLTw" id="7Bx7XgEibFu" role="2Oq$k0">
-              <ref role="3cqZAo" node="7Bx7XgEibEN" resolve="tf1" />
-            </node>
             <node concept="liA8E" id="7Bx7XgEibFv" role="2OqNvi">
               <ref role="37wK5l" node="7Bx7XgEiqaI" resolve="calcCoerce" />
               <node concept="37vLTw" id="7Bx7XgEibFw" role="37wK5m">
@@ -4928,6 +4979,16 @@
                 <ref role="3cqZAo" node="7Bx7XgEibEH" resolve="target" />
               </node>
             </node>
+            <node concept="2YIFZM" id="2qsG4AwKxKq" role="2Oq$k0">
+              <ref role="37wK5l" node="2qsG4AwKdr0" resolve="forNodeAndConcept" />
+              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+              <node concept="37vLTw" id="2qsG4AwKxKr" role="37wK5m">
+                <ref role="3cqZAo" node="7Bx7XgEibEF" resolve="source" />
+              </node>
+              <node concept="37vLTw" id="2qsG4AwKxKs" role="37wK5m">
+                <ref role="3cqZAo" node="7Bx7XgEibEH" resolve="target" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
@@ -5082,7 +5143,7 @@
       <node concept="3uibUv" id="3IIf9O_Z77V" role="3clF45">
         <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
       </node>
-      <node concept="3Tmbuc" id="6$gg4kBQEdi" role="1B3o_S" />
+      <node concept="3Tm1VV" id="2qsG4AwG7ht" role="1B3o_S" />
       <node concept="3clFbS" id="3IIf9O_Z6It" role="3clF47">
         <node concept="3clFbF" id="3IIf9O_Z8fP" role="3cqZAp">
           <node concept="2ShNRf" id="3IIf9O_Z8fL" role="3clFbG">
@@ -5100,7 +5161,181 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="2qsG4AwJ54G" role="jymVt" />
+    <node concept="2YIFZL" id="2qsG4AwIYLn" role="jymVt">
+      <property role="TrG5h" value="for2Node" />
+      <node concept="37vLTG" id="2qsG4AwIYLo" role="3clF46">
+        <property role="TrG5h" value="node1" />
+        <node concept="3Tqbb2" id="2qsG4AwIYLp" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2qsG4AwJcNJ" role="3clF46">
+        <property role="TrG5h" value="node2" />
+        <node concept="3Tqbb2" id="2qsG4AwJeCW" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="2qsG4AwIYLq" role="3clF45">
+        <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+      </node>
+      <node concept="3Tm1VV" id="2qsG4AwIYLr" role="1B3o_S" />
+      <node concept="3clFbS" id="2qsG4AwIYLs" role="3clF47">
+        <node concept="3cpWs8" id="2qsG4AwJiyp" role="3cqZAp">
+          <node concept="3cpWsn" id="2qsG4AwJiyq" role="3cpWs9">
+            <property role="TrG5h" value="tf1" />
+            <node concept="3uibUv" id="2qsG4AwJiyr" role="1tU5fm">
+              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+            </node>
+            <node concept="2YIFZM" id="2qsG4AwJiys" role="33vP2m">
+              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
+              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+              <node concept="37vLTw" id="2qsG4AwJkvW" role="37wK5m">
+                <ref role="3cqZAo" node="2qsG4AwIYLo" resolve="node1" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2qsG4AwJiyu" role="3cqZAp">
+          <node concept="3cpWsn" id="2qsG4AwJiyv" role="3cpWs9">
+            <property role="TrG5h" value="tf2" />
+            <node concept="3uibUv" id="2qsG4AwJiyw" role="1tU5fm">
+              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+            </node>
+            <node concept="2YIFZM" id="2qsG4AwJiyx" role="33vP2m">
+              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
+              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+              <node concept="37vLTw" id="2qsG4AwJlAx" role="37wK5m">
+                <ref role="3cqZAo" node="2qsG4AwJcNJ" resolve="node2" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2qsG4AwJiyz" role="3cqZAp" />
+        <node concept="3clFbJ" id="2qsG4AwJiy$" role="3cqZAp">
+          <node concept="3clFbS" id="2qsG4AwJiy_" role="3clFbx">
+            <node concept="YS8fn" id="2qsG4AwJiyA" role="3cqZAp">
+              <node concept="2ShNRf" id="2qsG4AwJiyB" role="YScLw">
+                <node concept="1pGfFk" id="2qsG4AwJiyC" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+                  <node concept="Xl_RD" id="2qsG4AwJiyD" role="37wK5m">
+                    <property role="Xl_RC" value="repositories differ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="2qsG4AwJiyE" role="3clFbw">
+            <node concept="2OqwBi" id="2qsG4AwJiyF" role="3uHU7w">
+              <node concept="37vLTw" id="2qsG4AwJiyG" role="2Oq$k0">
+                <ref role="3cqZAo" node="2qsG4AwJiyv" resolve="tf2" />
+              </node>
+              <node concept="2OwXpG" id="2qsG4AwJiyH" role="2OqNvi">
+                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2qsG4AwJiyI" role="3uHU7B">
+              <node concept="37vLTw" id="2qsG4AwJiyJ" role="2Oq$k0">
+                <ref role="3cqZAo" node="2qsG4AwJiyq" resolve="tf1" />
+              </node>
+              <node concept="2OwXpG" id="2qsG4AwJiyK" role="2OqNvi">
+                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2qsG4AwJivY" role="3cqZAp" />
+        <node concept="3clFbF" id="2qsG4AwJmZH" role="3cqZAp">
+          <node concept="37vLTw" id="2qsG4AwJmZF" role="3clFbG">
+            <ref role="3cqZAo" node="2qsG4AwJiyq" resolve="tf1" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="3IIf9O_Z6oz" role="jymVt" />
+    <node concept="2YIFZL" id="2qsG4AwKdr0" role="jymVt">
+      <property role="TrG5h" value="forNodeAndConcept" />
+      <node concept="37vLTG" id="2qsG4AwKdr1" role="3clF46">
+        <property role="TrG5h" value="node" />
+        <node concept="3Tqbb2" id="2qsG4AwKdr2" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2qsG4AwKdr3" role="3clF46">
+        <property role="TrG5h" value="concept" />
+        <node concept="3bZ5Sz" id="2qsG4AwKrVe" role="1tU5fm" />
+      </node>
+      <node concept="3uibUv" id="2qsG4AwKdr5" role="3clF45">
+        <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+      </node>
+      <node concept="3Tm1VV" id="2qsG4AwKdr6" role="1B3o_S" />
+      <node concept="3clFbS" id="2qsG4AwKdr7" role="3clF47">
+        <node concept="3cpWs8" id="2qsG4AwKdr8" role="3cqZAp">
+          <node concept="3cpWsn" id="2qsG4AwKdr9" role="3cpWs9">
+            <property role="TrG5h" value="tf1" />
+            <node concept="3uibUv" id="2qsG4AwKdra" role="1tU5fm">
+              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+            </node>
+            <node concept="2YIFZM" id="2qsG4AwKdrb" role="33vP2m">
+              <ref role="37wK5l" node="3IIf9O_Z6Ip" resolve="forNode" />
+              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+              <node concept="37vLTw" id="2qsG4AwKdrc" role="37wK5m">
+                <ref role="3cqZAo" node="2qsG4AwKdr1" resolve="node" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2qsG4AwKdrd" role="3cqZAp">
+          <node concept="3cpWsn" id="2qsG4AwKdre" role="3cpWs9">
+            <property role="TrG5h" value="tf2" />
+            <node concept="3uibUv" id="2qsG4AwKdrf" role="1tU5fm">
+              <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+            </node>
+            <node concept="2YIFZM" id="2qsG4AwKw64" role="33vP2m">
+              <ref role="37wK5l" node="7Bx7XgEii_q" resolve="forConcept" />
+              <ref role="1Pybhc" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+              <node concept="37vLTw" id="2qsG4AwKw65" role="37wK5m">
+                <ref role="3cqZAo" node="2qsG4AwKdr3" resolve="concept" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2qsG4AwKdri" role="3cqZAp" />
+        <node concept="3clFbJ" id="2qsG4AwKdrj" role="3cqZAp">
+          <node concept="3clFbS" id="2qsG4AwKdrk" role="3clFbx">
+            <node concept="YS8fn" id="2qsG4AwKdrl" role="3cqZAp">
+              <node concept="2ShNRf" id="2qsG4AwKdrm" role="YScLw">
+                <node concept="1pGfFk" id="2qsG4AwKdrn" role="2ShVmc">
+                  <ref role="37wK5l" to="wyt6:~IllegalArgumentException.&lt;init&gt;(java.lang.String)" resolve="IllegalArgumentException" />
+                  <node concept="Xl_RD" id="2qsG4AwKdro" role="37wK5m">
+                    <property role="Xl_RC" value="repositories differ" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="2qsG4AwKdrp" role="3clFbw">
+            <node concept="2OqwBi" id="2qsG4AwKdrq" role="3uHU7w">
+              <node concept="37vLTw" id="2qsG4AwKdrr" role="2Oq$k0">
+                <ref role="3cqZAo" node="2qsG4AwKdre" resolve="tf2" />
+              </node>
+              <node concept="2OwXpG" id="2qsG4AwKdrs" role="2OqNvi">
+                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="2qsG4AwKdrt" role="3uHU7B">
+              <node concept="37vLTw" id="2qsG4AwKdru" role="2Oq$k0">
+                <ref role="3cqZAo" node="2qsG4AwKdr9" resolve="tf1" />
+              </node>
+              <node concept="2OwXpG" id="2qsG4AwKdrv" role="2OqNvi">
+                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2qsG4AwKdrw" role="3cqZAp" />
+        <node concept="3clFbF" id="2qsG4AwKdrx" role="3cqZAp">
+          <node concept="37vLTw" id="2qsG4AwKdry" role="3clFbG">
+            <ref role="3cqZAo" node="2qsG4AwKdr9" resolve="tf1" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwKdqZ" role="jymVt" />
     <node concept="2YIFZL" id="7Bx7XgEii_q" role="jymVt">
       <property role="TrG5h" value="forConcept" />
       <node concept="37vLTG" id="7Bx7XgEii_r" role="3clF46">
@@ -5110,7 +5345,7 @@
       <node concept="3uibUv" id="7Bx7XgEii_t" role="3clF45">
         <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
       </node>
-      <node concept="3Tmbuc" id="7Bx7XgEii_u" role="1B3o_S" />
+      <node concept="3Tm1VV" id="2qsG4AwG9nW" role="1B3o_S" />
       <node concept="3clFbS" id="7Bx7XgEii_v" role="3clF47">
         <node concept="3clFbF" id="7Bx7XgEii_w" role="3cqZAp">
           <node concept="2ShNRf" id="7Bx7XgEii_x" role="3clFbG">
@@ -5140,7 +5375,7 @@
       <node concept="3uibUv" id="1FOQehxzdlB" role="3clF45">
         <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
       </node>
-      <node concept="3Tmbuc" id="6$gg4k_fPQX" role="1B3o_S" />
+      <node concept="3Tm1VV" id="2qsG4AwGb5y" role="1B3o_S" />
       <node concept="3clFbS" id="1FOQehxzbI4" role="3clF47">
         <node concept="3clFbF" id="1FOQehxzdzZ" role="3cqZAp">
           <node concept="2ShNRf" id="1FOQehxzdzX" role="3clFbG">
@@ -5166,7 +5401,7 @@
       <node concept="3uibUv" id="5KrJ7UHN2kK" role="3clF45">
         <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
       </node>
-      <node concept="3Tmbuc" id="6$gg4k_fH5z" role="1B3o_S" />
+      <node concept="3Tm1VV" id="2qsG4AwGcLI" role="1B3o_S" />
       <node concept="3clFbS" id="5KrJ7UHN1Lo" role="3clF47">
         <node concept="3SKdUt" id="5KrJ7UHN4OP" role="3cqZAp">
           <node concept="1PaTwC" id="589APehYyiN" role="3ndbpf">
@@ -5214,6 +5449,38 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1G9Y_QvbsSD" role="jymVt" />
+    <node concept="3clFb_" id="1G9Y_Qvby8B" role="jymVt">
+      <property role="TrG5h" value="withTraceObject" />
+      <node concept="37vLTG" id="1G9Y_QvckK$" role="3clF46">
+        <property role="TrG5h" value="traceObject" />
+        <node concept="3uibUv" id="1G9Y_QvcrFJ" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="1G9Y_QvcPj0" role="3clF45">
+        <ref role="3uigEE" node="7kaxm0sEy3e" resolve="TypecheckingService" />
+      </node>
+      <node concept="3Tm1VV" id="2qsG4AwGiwv" role="1B3o_S" />
+      <node concept="3clFbS" id="1G9Y_Qvby8F" role="3clF47">
+        <node concept="3clFbF" id="1G9Y_QvcvRW" role="3cqZAp">
+          <node concept="37vLTI" id="1G9Y_QvcvRY" role="3clFbG">
+            <node concept="2OqwBi" id="1G9Y_QvcLzE" role="37vLTJ">
+              <node concept="Xjq3P" id="1G9Y_QvcLnf" role="2Oq$k0" />
+              <node concept="2OwXpG" id="1G9Y_QvcNhu" role="2OqNvi">
+                <ref role="2Oxat5" node="1G9Y_Qvb9QJ" resolve="traceObject" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="1G9Y_QvcvS2" role="37vLTx">
+              <ref role="3cqZAo" node="1G9Y_QvckK$" resolve="traceObject" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1G9Y_QvcPeO" role="3cqZAp">
+          <node concept="Xjq3P" id="1G9Y_QvcPeM" role="3clFbG" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="5KrJ7UHMNU3" role="jymVt" />
     <node concept="3clFb_" id="1FOQehxdXIx" role="jymVt">
       <property role="TrG5h" value="checkTypes" />
@@ -5224,7 +5491,7 @@
       <node concept="3uibUv" id="1FOQehxe3$g" role="3clF45">
         <ref role="3uigEE" node="6QH_LDtcxgf" resolve="TypesIndex" />
       </node>
-      <node concept="3Tmbuc" id="6$gg4k_eVpK" role="1B3o_S" />
+      <node concept="3Tm1VV" id="2qsG4AwGoCk" role="1B3o_S" />
       <node concept="3clFbS" id="1FOQehxdXI_" role="3clF47">
         <node concept="3SKdUt" id="1FOQehxe0sZ" role="3cqZAp">
           <node concept="1PaTwC" id="589APehYyiW" role="3ndbpf">
@@ -5329,46 +5596,8 @@
         <node concept="3Tqbb2" id="1FOQehxpzJG" role="1tU5fm" />
       </node>
       <node concept="3Tqbb2" id="1FOQehxpsm7" role="3clF45" />
-      <node concept="3Tmbuc" id="6$gg4k_eR6V" role="1B3o_S" />
+      <node concept="3Tm1VV" id="2qsG4AwGulL" role="1B3o_S" />
       <node concept="3clFbS" id="1FOQehxpov6" role="3clF47">
-        <node concept="3SKdUt" id="1FOQehxnAVA" role="3cqZAp">
-          <node concept="1PaTwC" id="589APehYyj3" role="3ndbpf">
-            <node concept="3oM_SD" id="589APehYyj4" role="1PaTwD">
-              <property role="3oM_SC" value="ensure" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyj5" role="1PaTwD">
-              <property role="3oM_SC" value="we" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyj6" role="1PaTwD">
-              <property role="3oM_SC" value="can" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyj7" role="1PaTwD">
-              <property role="3oM_SC" value="read" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyj8" role="1PaTwD">
-              <property role="3oM_SC" value="the" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyj9" role="1PaTwD">
-              <property role="3oM_SC" value="model" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="1FOQehxnAVC" role="3cqZAp">
-          <node concept="2OqwBi" id="1FOQehxnAVD" role="3clFbG">
-            <node concept="2OqwBi" id="1FOQehxnAVE" role="2Oq$k0">
-              <node concept="37vLTw" id="1FOQehxnAVF" role="2Oq$k0">
-                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-              <node concept="liA8E" id="1FOQehxnAVG" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
-              </node>
-            </node>
-            <node concept="liA8E" id="1FOQehxnAVH" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="1FOQehxnB32" role="3cqZAp" />
         <node concept="3clFbF" id="1FOQehxpAiY" role="3cqZAp">
           <node concept="1rXfSq" id="1FOQehxpAiX" role="3clFbG">
             <ref role="37wK5l" node="1FOQehxnxRH" resolve="calcTypeLocally" />
@@ -5392,77 +5621,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1FOQehxpn35" role="jymVt" />
-    <node concept="3clFbW" id="7kaxm0sEBCn" role="jymVt">
-      <node concept="37vLTG" id="3IIf9O_u8h8" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="3IIf9O_u8ki" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="7kaxm0sEBCp" role="3clF45" />
-      <node concept="3Tmbuc" id="3IIf9O_Zcfj" role="1B3o_S" />
-      <node concept="3clFbS" id="7kaxm0sEBCr" role="3clF47">
-        <node concept="3clFbF" id="3IIf9O_u8qZ" role="3cqZAp">
-          <node concept="37vLTI" id="3IIf9O_u8r1" role="3clFbG">
-            <node concept="2OqwBi" id="3IIf9O_u8KX" role="37vLTJ">
-              <node concept="Xjq3P" id="3IIf9O_u8Pt" role="2Oq$k0" />
-              <node concept="2OwXpG" id="3IIf9O_u8L0" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="3IIf9O_u8r5" role="37vLTx">
-              <ref role="3cqZAo" node="3IIf9O_u8h8" resolve="repository" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="5KrJ7UHMYFT" role="jymVt" />
-    <node concept="3clFbW" id="5KrJ7UHMY7K" role="jymVt">
-      <node concept="37vLTG" id="5KrJ7UHMY7L" role="3clF46">
-        <property role="TrG5h" value="repository" />
-        <node concept="3uibUv" id="5KrJ7UHMY7M" role="1tU5fm">
-          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="5KrJ7UHMZgn" role="3clF46">
-        <property role="TrG5h" value="reporter" />
-        <node concept="3uibUv" id="5KrJ7UHMZgo" role="1tU5fm">
-          <ref role="3uigEE" to="1yqb:5KrJ7UHMRRs" resolve="ReportSink" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="5KrJ7UHMY7N" role="3clF45" />
-      <node concept="3Tmbuc" id="5KrJ7UHMY7O" role="1B3o_S" />
-      <node concept="3clFbS" id="5KrJ7UHMY7P" role="3clF47">
-        <node concept="3clFbF" id="5KrJ7UHMY7Q" role="3cqZAp">
-          <node concept="37vLTI" id="5KrJ7UHMY7R" role="3clFbG">
-            <node concept="2OqwBi" id="5KrJ7UHMY7S" role="37vLTJ">
-              <node concept="Xjq3P" id="5KrJ7UHMY7T" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5KrJ7UHMY7U" role="2OqNvi">
-                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="5KrJ7UHMY7V" role="37vLTx">
-              <ref role="3cqZAo" node="5KrJ7UHMY7L" resolve="repository" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="5KrJ7UHMZjr" role="3cqZAp">
-          <node concept="37vLTI" id="5KrJ7UHMZjt" role="3clFbG">
-            <node concept="2OqwBi" id="5KrJ7UHMZU7" role="37vLTJ">
-              <node concept="Xjq3P" id="5KrJ7UHMZVl" role="2Oq$k0" />
-              <node concept="2OwXpG" id="5KrJ7UHMZUa" role="2OqNvi">
-                <ref role="2Oxat5" node="5KrJ7UHMZjn" resolve="reportSink" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="5KrJ7UHMZjx" role="37vLTx">
-              <ref role="3cqZAo" node="5KrJ7UHMZgn" resolve="reporter" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6$gg4k_fhpX" role="jymVt" />
     <node concept="3clFb_" id="3IIf9O_tkwF" role="jymVt">
       <property role="TrG5h" value="calcTypeOf" />
       <node concept="37vLTG" id="3IIf9O_tkBA" role="3clF46">
@@ -5470,7 +5628,7 @@
         <node concept="3Tqbb2" id="3IIf9O_tmJD" role="1tU5fm" />
       </node>
       <node concept="3Tqbb2" id="3IIf9O_tlg1" role="3clF45" />
-      <node concept="3Tm6S6" id="6$gg4k_eYZ2" role="1B3o_S" />
+      <node concept="3Tm1VV" id="2qsG4AwGHD0" role="1B3o_S" />
       <node concept="3clFbS" id="3IIf9O_tkwJ" role="3clF47">
         <node concept="3SKdUt" id="3IIf9O_tnmk" role="3cqZAp">
           <node concept="1PaTwC" id="589APehYyja" role="3ndbpf">
@@ -5644,7 +5802,637 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1FOQehwZVz0" role="jymVt" />
+    <node concept="2tJIrI" id="2qsG4AwHaOl" role="jymVt" />
+    <node concept="3clFb_" id="3IIf9OAgpFT" role="jymVt">
+      <property role="TrG5h" value="calcConverts" />
+      <node concept="37vLTG" id="3IIf9OAgpZx" role="3clF46">
+        <property role="TrG5h" value="source" />
+        <node concept="3Tqbb2" id="3IIf9OAgs8v" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3IIf9OAgs8X" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3Tqbb2" id="3IIf9OAgspX" role="1tU5fm" />
+      </node>
+      <node concept="10P_77" id="3IIf9OAgqhD" role="3clF45" />
+      <node concept="3Tm1VV" id="2qsG4AwIbht" role="1B3o_S" />
+      <node concept="3clFbS" id="3IIf9OAgpFX" role="3clF47">
+        <node concept="3SKdUt" id="2qsG4AwJzz5" role="3cqZAp">
+          <node concept="1PaTwC" id="2qsG4AwJzz6" role="3ndbpf">
+            <node concept="3oM_SD" id="2qsG4AwJzz7" role="1PaTwD">
+              <property role="3oM_SC" value="ensure" />
+            </node>
+            <node concept="3oM_SD" id="2qsG4AwJzz8" role="1PaTwD">
+              <property role="3oM_SC" value="we" />
+            </node>
+            <node concept="3oM_SD" id="2qsG4AwJzz9" role="1PaTwD">
+              <property role="3oM_SC" value="can" />
+            </node>
+            <node concept="3oM_SD" id="2qsG4AwJzza" role="1PaTwD">
+              <property role="3oM_SC" value="read" />
+            </node>
+            <node concept="3oM_SD" id="2qsG4AwJzzb" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2qsG4AwJzzc" role="1PaTwD">
+              <property role="3oM_SC" value="model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2qsG4AwJzzd" role="3cqZAp">
+          <node concept="2OqwBi" id="2qsG4AwJzze" role="3clFbG">
+            <node concept="2OqwBi" id="2qsG4AwJzzf" role="2Oq$k0">
+              <node concept="37vLTw" id="2qsG4AwJzzg" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+              <node concept="liA8E" id="2qsG4AwJzzh" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
+              </node>
+            </node>
+            <node concept="liA8E" id="2qsG4AwJzzi" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2qsG4AwJuna" role="3cqZAp" />
+        <node concept="3cpWs8" id="3IIf9OAgvDK" role="3cqZAp">
+          <node concept="3cpWsn" id="3IIf9OAgvDL" role="3cpWs9">
+            <property role="TrG5h" value="helpers" />
+            <node concept="_YKpA" id="3KN3A4vGHYf" role="1tU5fm">
+              <node concept="3uibUv" id="3KN3A4vGHYg" role="_ZDj9">
+                <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+              </node>
+            </node>
+            <node concept="1rXfSq" id="1FOQehxo9Cz" role="33vP2m">
+              <ref role="37wK5l" node="3KN3A4vEXni" resolve="helpers" />
+              <node concept="2ShNRf" id="1FOQehxocJV" role="37wK5m">
+                <node concept="Tc6Ow" id="1FOQehxocJW" role="2ShVmc">
+                  <node concept="3Tqbb2" id="1FOQehxocJX" role="HW$YZ" />
+                  <node concept="37vLTw" id="1FOQehxocJY" role="HW$Y0">
+                    <ref role="3cqZAo" node="3IIf9OAgpZx" resolve="source" />
+                  </node>
+                  <node concept="37vLTw" id="1FOQehxocJZ" role="HW$Y0">
+                    <ref role="3cqZAo" node="3IIf9OAgs8X" resolve="target" />
+                  </node>
+                </node>
+              </node>
+              <node concept="10M0yZ" id="1FOQehxo9MY" role="37wK5m">
+                <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+                <ref role="3cqZAo" node="4t7Xo7inO_s" resolve="CONVERT" />
+              </node>
+              <node concept="37vLTw" id="4pwDyRB_i7N" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9OAgpZx" resolve="source" />
+              </node>
+              <node concept="37vLTw" id="4pwDyRB_jap" role="37wK5m">
+                <ref role="3cqZAo" node="3IIf9OAgs8X" resolve="target" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3KN3A4vGJ3f" role="3cqZAp" />
+        <node concept="1DcWWT" id="3KN3A4vLuiv" role="3cqZAp">
+          <node concept="3clFbS" id="3KN3A4vLuiy" role="2LFqv$">
+            <node concept="SfApY" id="2BZXJecZP8N" role="3cqZAp">
+              <node concept="3clFbS" id="2BZXJecZP8P" role="SfCbr">
+                <node concept="3cpWs8" id="2daneBPBKoA" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPBKoB" role="3cpWs9">
+                    <property role="TrG5h" value="effect" />
+                    <node concept="3uibUv" id="2daneBPBKoC" role="1tU5fm">
+                      <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                      <node concept="3qTvmN" id="3bpBM3PiBsA" role="11_B2D" />
+                    </node>
+                    <node concept="2OqwBi" id="2daneBPBKoD" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPBKoE" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3KN3A4vLuiz" resolve="helper" />
+                      </node>
+                      <node concept="liA8E" id="2daneBPBKoF" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="2daneBPBKoG" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPBKoH" role="3cpWs9">
+                    <property role="TrG5h" value="reportItems" />
+                    <node concept="_YKpA" id="2daneBPBKoI" role="1tU5fm">
+                      <node concept="3uibUv" id="2daneBPBKoJ" role="_ZDj9">
+                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="2daneBPBKoK" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPBKoL" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBPBKoB" resolve="effect" />
+                      </node>
+                      <node concept="liA8E" id="2daneBPBKoM" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="2daneBPBKoN" role="37wK5m">
+                          <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
+                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2daneBPBKps" role="3cqZAp">
+                  <node concept="1rXfSq" id="2daneBPBKpt" role="3clFbG">
+                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
+                    <node concept="37vLTw" id="2daneBPBKpu" role="37wK5m">
+                      <ref role="3cqZAo" node="2daneBPBKoH" resolve="reportItems" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="1G9Y_Qve6tI" role="3cqZAp">
+                  <node concept="3cpWsn" id="1G9Y_Qve6tJ" role="3cpWs9">
+                    <property role="TrG5h" value="traceEvents" />
+                    <node concept="3uibUv" id="1G9Y_Qve6tK" role="1tU5fm">
+                      <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+                    </node>
+                    <node concept="2OqwBi" id="1G9Y_Qve6tL" role="33vP2m">
+                      <node concept="37vLTw" id="1G9Y_Qve6tM" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBPBKoB" resolve="effect" />
+                      </node>
+                      <node concept="liA8E" id="1G9Y_Qve6tN" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="1G9Y_Qve6tO" role="37wK5m">
+                          <ref role="3cqZAo" node="1G9Y_Qv7rZx" resolve="TRACE_EVENTS" />
+                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="1G9Y_Qve6ut" role="3cqZAp">
+                  <node concept="3clFbS" id="1G9Y_Qve6uu" role="3clFbx">
+                    <node concept="3clFbF" id="1G9Y_Qve6uv" role="3cqZAp">
+                      <node concept="1rXfSq" id="1G9Y_Qve6uw" role="3clFbG">
+                        <ref role="37wK5l" node="1G9Y_Qva5KG" resolve="addTraceEvents" />
+                        <node concept="37vLTw" id="1G9Y_Qve6ux" role="37wK5m">
+                          <ref role="3cqZAo" node="1G9Y_Qve6tJ" resolve="traceEvents" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3y3z36" id="1G9Y_Qve6uy" role="3clFbw">
+                    <node concept="10Nm6u" id="1G9Y_Qve6uz" role="3uHU7w" />
+                    <node concept="37vLTw" id="1G9Y_Qve6u$" role="3uHU7B">
+                      <ref role="3cqZAo" node="1G9Y_Qve6tJ" resolve="traceEvents" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="1FOQehxofbl" role="3cqZAp" />
+              </node>
+              <node concept="TDmWw" id="2BZXJecZP8Q" role="TEbGg">
+                <node concept="3cpWsn" id="2BZXJecZP8S" role="TDEfY">
+                  <property role="TrG5h" value="ex" />
+                  <node concept="3uibUv" id="2BZXJecZPm3" role="1tU5fm">
+                    <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="2BZXJecZP8W" role="TDEfX">
+                  <node concept="3clFbJ" id="1FOQehxyx$2" role="3cqZAp">
+                    <node concept="3clFbS" id="1FOQehxyx$3" role="3clFbx">
+                      <node concept="3clFbF" id="1FOQehxyx$4" role="3cqZAp">
+                        <node concept="2OqwBi" id="1FOQehxyx$5" role="3clFbG">
+                          <node concept="37vLTw" id="1FOQehxyx$6" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                          </node>
+                          <node concept="liA8E" id="1FOQehxyx$7" role="2OqNvi">
+                            <ref role="37wK5l" to="1yqb:5KrJ7UHMRSa" resolve="report" />
+                            <node concept="2ShNRf" id="1FOQehxyx$8" role="37wK5m">
+                              <node concept="1pGfFk" id="1FOQehxyx$9" role="2ShVmc">
+                                <ref role="37wK5l" node="1FOQehxyAYy" resolve="LaunchProblemReportItem" />
+                                <node concept="Rm8GO" id="1FOQehxyx$a" role="37wK5m">
+                                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                                </node>
+                                <node concept="Xl_RD" id="1FOQehxyx$b" role="37wK5m">
+                                  <property role="Xl_RC" value="error launching typechecking" />
+                                </node>
+                                <node concept="37vLTw" id="1FOQehxyDr1" role="37wK5m">
+                                  <ref role="3cqZAo" node="2BZXJecZP8S" resolve="ex" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3y3z36" id="1FOQehxyx$c" role="3clFbw">
+                      <node concept="10Nm6u" id="1FOQehxyx$d" role="3uHU7w" />
+                      <node concept="37vLTw" id="1FOQehxyx$e" role="3uHU7B">
+                        <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3SKdUt" id="3KN3A4vLXzP" role="3cqZAp">
+                    <node concept="1PaTwC" id="3KN3A4vLXzQ" role="3ndbpf">
+                      <node concept="3oM_SD" id="3KN3A4vM2Fr" role="1PaTwD">
+                        <property role="3oM_SC" value="return" />
+                      </node>
+                      <node concept="3oM_SD" id="3KN3A4vM2G9" role="1PaTwD">
+                        <property role="3oM_SC" value="false" />
+                      </node>
+                      <node concept="3oM_SD" id="3KN3A4vM2GS" role="1PaTwD">
+                        <property role="3oM_SC" value="on" />
+                      </node>
+                      <node concept="3oM_SD" id="3KN3A4vM2GW" role="1PaTwD">
+                        <property role="3oM_SC" value="error" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3cpWs6" id="2BZXJecZP$A" role="3cqZAp">
+                    <node concept="3clFbT" id="2BZXJecZPVl" role="3cqZAk">
+                      <property role="3clFbU" value="false" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="3KN3A4vLuiz" role="1Duv9x">
+            <property role="TrG5h" value="helper" />
+            <node concept="3uibUv" id="3KN3A4vLuiB" role="1tU5fm">
+              <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="3KN3A4vLuiC" role="1DdaDG">
+            <ref role="3cqZAo" node="3IIf9OAgvDL" resolve="helpers" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="3KN3A4vLOjh" role="3cqZAp" />
+        <node concept="3cpWs6" id="2BZXJecZTz9" role="3cqZAp">
+          <node concept="3clFbT" id="2BZXJecZTXe" role="3cqZAk">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwI5oP" role="jymVt" />
+    <node concept="3clFb_" id="7Bx7XgEiqaI" role="jymVt">
+      <property role="TrG5h" value="calcCoerce" />
+      <node concept="37vLTG" id="7Bx7XgEiqaJ" role="3clF46">
+        <property role="TrG5h" value="source" />
+        <node concept="3Tqbb2" id="7Bx7XgEiqaK" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="7Bx7XgEiqaL" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3bZ5Sz" id="7Bx7XgEiuBL" role="1tU5fm" />
+      </node>
+      <node concept="3Tqbb2" id="4pwDyRBs7L$" role="3clF45" />
+      <node concept="3Tm1VV" id="2qsG4AwILd7" role="1B3o_S" />
+      <node concept="3clFbS" id="7Bx7XgEiqaP" role="3clF47">
+        <node concept="3SKdUt" id="2qsG4AwJGTz" role="3cqZAp">
+          <node concept="1PaTwC" id="2qsG4AwJGT$" role="3ndbpf">
+            <node concept="3oM_SD" id="2qsG4AwJGT_" role="1PaTwD">
+              <property role="3oM_SC" value="ensure" />
+            </node>
+            <node concept="3oM_SD" id="2qsG4AwJGTA" role="1PaTwD">
+              <property role="3oM_SC" value="we" />
+            </node>
+            <node concept="3oM_SD" id="2qsG4AwJGTB" role="1PaTwD">
+              <property role="3oM_SC" value="can" />
+            </node>
+            <node concept="3oM_SD" id="2qsG4AwJGTC" role="1PaTwD">
+              <property role="3oM_SC" value="read" />
+            </node>
+            <node concept="3oM_SD" id="2qsG4AwJGTD" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="2qsG4AwJGTE" role="1PaTwD">
+              <property role="3oM_SC" value="model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2qsG4AwJGTF" role="3cqZAp">
+          <node concept="2OqwBi" id="2qsG4AwJGTG" role="3clFbG">
+            <node concept="2OqwBi" id="2qsG4AwJGTH" role="2Oq$k0">
+              <node concept="37vLTw" id="2qsG4AwJGTI" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+              <node concept="liA8E" id="2qsG4AwJGTJ" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
+              </node>
+            </node>
+            <node concept="liA8E" id="2qsG4AwJGTK" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2qsG4AwJC5_" role="3cqZAp" />
+        <node concept="3cpWs8" id="4pwDyRBsdy6" role="3cqZAp">
+          <node concept="3cpWsn" id="4pwDyRBsdy7" role="3cpWs9">
+            <property role="TrG5h" value="lresult" />
+            <node concept="3uibUv" id="4pwDyRBsdy8" role="1tU5fm">
+              <ref role="3uigEE" to="z9ve:~LogicalImpl" resolve="LogicalImpl" />
+              <node concept="3Tqbb2" id="4pwDyRBsdy9" role="11_B2D" />
+            </node>
+            <node concept="2ShNRf" id="4pwDyRBsdya" role="33vP2m">
+              <node concept="1pGfFk" id="4pwDyRBsdyb" role="2ShVmc">
+                <ref role="37wK5l" to="z9ve:~LogicalImpl.&lt;init&gt;(java.lang.String)" resolve="LogicalImpl" />
+                <node concept="3Tqbb2" id="4pwDyRBshWN" role="1pMfVU" />
+                <node concept="Xl_RD" id="4pwDyRBsi7v" role="37wK5m">
+                  <property role="Xl_RC" value="result" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3KN3A4vMcDB" role="3cqZAp" />
+        <node concept="3cpWs8" id="7Bx7XgEiqaQ" role="3cqZAp">
+          <node concept="3cpWsn" id="7Bx7XgEiqaR" role="3cpWs9">
+            <property role="TrG5h" value="helpers" />
+            <node concept="_YKpA" id="3KN3A4vGNbz" role="1tU5fm">
+              <node concept="3uibUv" id="3KN3A4vGNb$" role="_ZDj9">
+                <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+              </node>
+            </node>
+            <node concept="1rXfSq" id="7Bx7XgEiqaT" role="33vP2m">
+              <ref role="37wK5l" node="3KN3A4vEXni" resolve="helpers" />
+              <node concept="2ShNRf" id="7Bx7XgEiqaU" role="37wK5m">
+                <node concept="Tc6Ow" id="7Bx7XgEiqaV" role="2ShVmc">
+                  <node concept="3Tqbb2" id="4pwDyRAFapp" role="HW$YZ" />
+                  <node concept="37vLTw" id="7Bx7XgEiqaX" role="HW$Y0">
+                    <ref role="3cqZAo" node="7Bx7XgEiqaJ" resolve="source" />
+                  </node>
+                </node>
+              </node>
+              <node concept="10M0yZ" id="7Bx7XgEixyk" role="37wK5m">
+                <ref role="3cqZAo" node="7Bx7XgEgdEp" resolve="COERCE" />
+                <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
+              </node>
+              <node concept="37vLTw" id="4pwDyRB_s2y" role="37wK5m">
+                <ref role="3cqZAo" node="7Bx7XgEiqaJ" resolve="source" />
+              </node>
+              <node concept="37vLTw" id="4pwDyRB_sR2" role="37wK5m">
+                <ref role="3cqZAo" node="7Bx7XgEiqaL" resolve="target" />
+              </node>
+              <node concept="37vLTw" id="4pwDyRBsoUq" role="37wK5m">
+                <ref role="3cqZAo" node="4pwDyRBsdy7" resolve="lresult" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3KN3A4vM2Ip" role="3cqZAp" />
+        <node concept="1DcWWT" id="3KN3A4vMmtg" role="3cqZAp">
+          <node concept="3clFbS" id="3KN3A4vMmtj" role="2LFqv$">
+            <node concept="SfApY" id="7Bx7XgEiqb3" role="3cqZAp">
+              <node concept="3clFbS" id="7Bx7XgEiqb4" role="SfCbr">
+                <node concept="3cpWs8" id="2daneBPBRVH" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPBRVI" role="3cpWs9">
+                    <property role="TrG5h" value="effect" />
+                    <node concept="3uibUv" id="2daneBPBRVJ" role="1tU5fm">
+                      <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
+                      <node concept="3qTvmN" id="3bpBM3PiB_R" role="11_B2D" />
+                    </node>
+                    <node concept="2OqwBi" id="2daneBPBRVK" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPBRVL" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3KN3A4vMmtk" resolve="helper" />
+                      </node>
+                      <node concept="liA8E" id="2daneBPBRVM" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="2daneBPBRVN" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBPBRVO" role="3cpWs9">
+                    <property role="TrG5h" value="reportItems" />
+                    <node concept="_YKpA" id="2daneBPBRVP" role="1tU5fm">
+                      <node concept="3uibUv" id="2daneBPBRVQ" role="_ZDj9">
+                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="2daneBPBRVR" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBPBRVS" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBPBRVI" resolve="effect" />
+                      </node>
+                      <node concept="liA8E" id="2daneBPBRVT" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="2daneBPBRVU" role="37wK5m">
+                          <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
+                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2daneBPBRWz" role="3cqZAp">
+                  <node concept="1rXfSq" id="2daneBPBRW$" role="3clFbG">
+                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
+                    <node concept="37vLTw" id="2daneBPBRW_" role="37wK5m">
+                      <ref role="3cqZAo" node="2daneBPBRVO" resolve="reportItems" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3cpWs8" id="1G9Y_Qve8SD" role="3cqZAp">
+                  <node concept="3cpWsn" id="1G9Y_Qve8SE" role="3cpWs9">
+                    <property role="TrG5h" value="traceEvents" />
+                    <node concept="3uibUv" id="1G9Y_Qve8SF" role="1tU5fm">
+                      <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+                    </node>
+                    <node concept="2OqwBi" id="1G9Y_Qve8SG" role="33vP2m">
+                      <node concept="37vLTw" id="1G9Y_Qve8SH" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBPBRVI" resolve="effect" />
+                      </node>
+                      <node concept="liA8E" id="1G9Y_Qve8SI" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="1G9Y_Qve8SJ" role="37wK5m">
+                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
+                          <ref role="3cqZAo" node="1G9Y_Qv7rZx" resolve="TRACE_EVENTS" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="1G9Y_Qve8To" role="3cqZAp">
+                  <node concept="3clFbS" id="1G9Y_Qve8Tp" role="3clFbx">
+                    <node concept="3clFbF" id="1G9Y_Qve8Tq" role="3cqZAp">
+                      <node concept="1rXfSq" id="1G9Y_Qve8Tr" role="3clFbG">
+                        <ref role="37wK5l" node="1G9Y_Qva5KG" resolve="addTraceEvents" />
+                        <node concept="37vLTw" id="1G9Y_Qve8Ts" role="37wK5m">
+                          <ref role="3cqZAo" node="1G9Y_Qve8SE" resolve="traceEvents" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3y3z36" id="1G9Y_Qve8Tt" role="3clFbw">
+                    <node concept="10Nm6u" id="1G9Y_Qve8Tu" role="3uHU7w" />
+                    <node concept="37vLTw" id="1G9Y_Qve8Tv" role="3uHU7B">
+                      <ref role="3cqZAo" node="1G9Y_Qve8SE" resolve="traceEvents" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="7Bx7XgEiqbw" role="3cqZAp" />
+                <node concept="3clFbJ" id="3KN3A4vMEVj" role="3cqZAp">
+                  <node concept="3clFbS" id="3KN3A4vMEVl" role="3clFbx">
+                    <node concept="3cpWs6" id="7Bx7XgEiqbx" role="3cqZAp">
+                      <node concept="2OqwBi" id="3KN3A4uTMpt" role="3cqZAk">
+                        <node concept="2OqwBi" id="3KN3A4uTMpu" role="2Oq$k0">
+                          <node concept="37vLTw" id="3KN3A4uTMpv" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4pwDyRBsdy7" resolve="lresult" />
+                          </node>
+                          <node concept="liA8E" id="3KN3A4uTMpw" role="2OqNvi">
+                            <ref role="37wK5l" to="z9ve:~LogicalImpl.findRoot()" resolve="findRoot" />
+                          </node>
+                        </node>
+                        <node concept="liA8E" id="3KN3A4uTMpx" role="2OqNvi">
+                          <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="3KN3A4vMLSK" role="3clFbw">
+                    <node concept="2OqwBi" id="3KN3A4vMKQL" role="2Oq$k0">
+                      <node concept="37vLTw" id="3KN3A4vMKn3" role="2Oq$k0">
+                        <ref role="3cqZAo" node="4pwDyRBsdy7" resolve="lresult" />
+                      </node>
+                      <node concept="liA8E" id="3KN3A4vMLoQ" role="2OqNvi">
+                        <ref role="37wK5l" to="z9ve:~LogicalImpl.findRoot()" resolve="findRoot" />
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="3KN3A4vMMk8" role="2OqNvi">
+                      <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="7Bx7XgEiqbz" role="3cqZAp" />
+              </node>
+              <node concept="TDmWw" id="7Bx7XgEiqb$" role="TEbGg">
+                <node concept="3cpWsn" id="7Bx7XgEiqb_" role="TDEfY">
+                  <property role="TrG5h" value="ex" />
+                  <node concept="3uibUv" id="7Bx7XgEiqbA" role="1tU5fm">
+                    <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="7Bx7XgEiqbB" role="TDEfX">
+                  <node concept="3clFbJ" id="7Bx7XgEiqbC" role="3cqZAp">
+                    <node concept="3clFbS" id="7Bx7XgEiqbD" role="3clFbx">
+                      <node concept="3clFbF" id="7Bx7XgEiqbE" role="3cqZAp">
+                        <node concept="2OqwBi" id="7Bx7XgEiqbF" role="3clFbG">
+                          <node concept="37vLTw" id="7Bx7XgEiqbG" role="2Oq$k0">
+                            <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                          </node>
+                          <node concept="liA8E" id="7Bx7XgEiqbH" role="2OqNvi">
+                            <ref role="37wK5l" to="1yqb:5KrJ7UHMRSa" resolve="report" />
+                            <node concept="2ShNRf" id="7Bx7XgEiqbI" role="37wK5m">
+                              <node concept="1pGfFk" id="7Bx7XgEiqbJ" role="2ShVmc">
+                                <ref role="37wK5l" node="1FOQehxyAYy" resolve="LaunchProblemReportItem" />
+                                <node concept="Rm8GO" id="7Bx7XgEiqbK" role="37wK5m">
+                                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
+                                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
+                                </node>
+                                <node concept="Xl_RD" id="7Bx7XgEiqbL" role="37wK5m">
+                                  <property role="Xl_RC" value="error launching typechecking" />
+                                </node>
+                                <node concept="37vLTw" id="7Bx7XgEiqbM" role="37wK5m">
+                                  <ref role="3cqZAo" node="7Bx7XgEiqb_" resolve="ex" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3y3z36" id="7Bx7XgEiqbN" role="3clFbw">
+                      <node concept="10Nm6u" id="7Bx7XgEiqbO" role="3uHU7w" />
+                      <node concept="37vLTw" id="7Bx7XgEiqbP" role="3uHU7B">
+                        <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="3KN3A4vNmiH" role="3cqZAp" />
+                  <node concept="3zACq4" id="3KN3A4vNh48" role="3cqZAp" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWsn" id="3KN3A4vMmtk" role="1Duv9x">
+            <property role="TrG5h" value="helper" />
+            <node concept="3uibUv" id="3KN3A4vMmto" role="1tU5fm">
+              <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
+            </node>
+          </node>
+          <node concept="37vLTw" id="3KN3A4vMmtp" role="1DdaDG">
+            <ref role="3cqZAo" node="7Bx7XgEiqaR" resolve="helpers" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="3KN3A4vNrrV" role="3cqZAp" />
+        <node concept="3cpWs6" id="7Bx7XgEiqbR" role="3cqZAp">
+          <node concept="10Nm6u" id="4pwDyRBsDXc" role="3cqZAk" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwIR79" role="jymVt" />
+    <node concept="3clFbW" id="7kaxm0sEBCn" role="jymVt">
+      <node concept="37vLTG" id="3IIf9O_u8h8" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="3IIf9O_u8ki" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7kaxm0sEBCp" role="3clF45" />
+      <node concept="3Tmbuc" id="3IIf9O_Zcfj" role="1B3o_S" />
+      <node concept="3clFbS" id="7kaxm0sEBCr" role="3clF47">
+        <node concept="3clFbF" id="3IIf9O_u8qZ" role="3cqZAp">
+          <node concept="37vLTI" id="3IIf9O_u8r1" role="3clFbG">
+            <node concept="2OqwBi" id="3IIf9O_u8KX" role="37vLTJ">
+              <node concept="Xjq3P" id="3IIf9O_u8Pt" role="2Oq$k0" />
+              <node concept="2OwXpG" id="3IIf9O_u8L0" role="2OqNvi">
+                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="3IIf9O_u8r5" role="37vLTx">
+              <ref role="3cqZAo" node="3IIf9O_u8h8" resolve="repository" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwGMSv" role="jymVt" />
+    <node concept="3clFbW" id="5KrJ7UHMY7K" role="jymVt">
+      <node concept="37vLTG" id="5KrJ7UHMY7L" role="3clF46">
+        <property role="TrG5h" value="repository" />
+        <node concept="3uibUv" id="5KrJ7UHMY7M" role="1tU5fm">
+          <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="5KrJ7UHMZgn" role="3clF46">
+        <property role="TrG5h" value="reporter" />
+        <node concept="3uibUv" id="5KrJ7UHMZgo" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:5KrJ7UHMRRs" resolve="ReportSink" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="5KrJ7UHMY7N" role="3clF45" />
+      <node concept="3Tmbuc" id="5KrJ7UHMY7O" role="1B3o_S" />
+      <node concept="3clFbS" id="5KrJ7UHMY7P" role="3clF47">
+        <node concept="3clFbF" id="5KrJ7UHMY7Q" role="3cqZAp">
+          <node concept="37vLTI" id="5KrJ7UHMY7R" role="3clFbG">
+            <node concept="2OqwBi" id="5KrJ7UHMY7S" role="37vLTJ">
+              <node concept="Xjq3P" id="5KrJ7UHMY7T" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5KrJ7UHMY7U" role="2OqNvi">
+                <ref role="2Oxat5" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5KrJ7UHMY7V" role="37vLTx">
+              <ref role="3cqZAo" node="5KrJ7UHMY7L" resolve="repository" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="5KrJ7UHMZjr" role="3cqZAp">
+          <node concept="37vLTI" id="5KrJ7UHMZjt" role="3clFbG">
+            <node concept="2OqwBi" id="5KrJ7UHMZU7" role="37vLTJ">
+              <node concept="Xjq3P" id="5KrJ7UHMZVl" role="2Oq$k0" />
+              <node concept="2OwXpG" id="5KrJ7UHMZUa" role="2OqNvi">
+                <ref role="2Oxat5" node="5KrJ7UHMZjn" resolve="reportSink" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="5KrJ7UHMZjx" role="37vLTx">
+              <ref role="3cqZAo" node="5KrJ7UHMZgn" resolve="reporter" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6$gg4k_fhpX" role="jymVt" />
     <node concept="3clFb_" id="1FOQehxnxRH" role="jymVt">
       <property role="TrG5h" value="calcTypeLocally" />
       <node concept="37vLTG" id="1FOQehxnAn0" role="3clF46">
@@ -5654,6 +6442,44 @@
       <node concept="3Tqbb2" id="1FOQehxoNPI" role="3clF45" />
       <node concept="3Tm6S6" id="1FOQehxoGRJ" role="1B3o_S" />
       <node concept="3clFbS" id="1FOQehxnxRL" role="3clF47">
+        <node concept="3SKdUt" id="1FOQehxnAVA" role="3cqZAp">
+          <node concept="1PaTwC" id="589APehYyj3" role="3ndbpf">
+            <node concept="3oM_SD" id="589APehYyj4" role="1PaTwD">
+              <property role="3oM_SC" value="ensure" />
+            </node>
+            <node concept="3oM_SD" id="589APehYyj5" role="1PaTwD">
+              <property role="3oM_SC" value="we" />
+            </node>
+            <node concept="3oM_SD" id="589APehYyj6" role="1PaTwD">
+              <property role="3oM_SC" value="can" />
+            </node>
+            <node concept="3oM_SD" id="589APehYyj7" role="1PaTwD">
+              <property role="3oM_SC" value="read" />
+            </node>
+            <node concept="3oM_SD" id="589APehYyj8" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="589APehYyj9" role="1PaTwD">
+              <property role="3oM_SC" value="model" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1FOQehxnAVC" role="3cqZAp">
+          <node concept="2OqwBi" id="1FOQehxnAVD" role="3clFbG">
+            <node concept="2OqwBi" id="1FOQehxnAVE" role="2Oq$k0">
+              <node concept="37vLTw" id="1FOQehxnAVF" role="2Oq$k0">
+                <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
+              </node>
+              <node concept="liA8E" id="1FOQehxnAVG" role="2OqNvi">
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
+              </node>
+            </node>
+            <node concept="liA8E" id="1FOQehxnAVH" role="2OqNvi">
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2qsG4AwJN4P" role="3cqZAp" />
         <node concept="3cpWs8" id="1FOQehxoMr3" role="3cqZAp">
           <node concept="3cpWsn" id="1FOQehxoMr4" role="3cpWs9">
             <property role="TrG5h" value="helpers" />
@@ -5731,6 +6557,44 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3cpWs8" id="1G9Y_QvdpUJ" role="3cqZAp">
+                  <node concept="3cpWsn" id="1G9Y_QvdpUK" role="3cpWs9">
+                    <property role="TrG5h" value="traceEvents" />
+                    <node concept="3uibUv" id="1G9Y_QvdpJH" role="1tU5fm">
+                      <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+                    </node>
+                    <node concept="2OqwBi" id="1G9Y_QvdpUL" role="33vP2m">
+                      <node concept="37vLTw" id="1G9Y_QvdpUM" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBP_A$J" resolve="effect" />
+                      </node>
+                      <node concept="liA8E" id="1G9Y_QvdpUN" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="1G9Y_QvdpUO" role="37wK5m">
+                          <ref role="3cqZAo" node="1G9Y_Qv7rZx" resolve="TRACE_EVENTS" />
+                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="1G9Y_QvdHQ6" role="3cqZAp">
+                  <node concept="3clFbS" id="1G9Y_QvdHQ8" role="3clFbx">
+                    <node concept="3clFbF" id="1G9Y_QvdSQ8" role="3cqZAp">
+                      <node concept="1rXfSq" id="1G9Y_QvdSQ6" role="3clFbG">
+                        <ref role="37wK5l" node="1G9Y_Qva5KG" resolve="addTraceEvents" />
+                        <node concept="37vLTw" id="1G9Y_QvdUVe" role="37wK5m">
+                          <ref role="3cqZAo" node="1G9Y_QvdpUK" resolve="traceEvents" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3y3z36" id="1G9Y_QvdSmC" role="3clFbw">
+                    <node concept="10Nm6u" id="1G9Y_QvdSBf" role="3uHU7w" />
+                    <node concept="37vLTw" id="1G9Y_QvdQWS" role="3uHU7B">
+                      <ref role="3cqZAo" node="1G9Y_QvdpUK" resolve="traceEvents" />
+                    </node>
+                  </node>
+                </node>
                 <node concept="3cpWs8" id="2daneBPAYoH" role="3cqZAp">
                   <node concept="3cpWsn" id="2daneBPAYoI" role="3cpWs9">
                     <property role="TrG5h" value="localType" />
@@ -5926,6 +6790,44 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3cpWs8" id="1G9Y_Qve48G" role="3cqZAp">
+                  <node concept="3cpWsn" id="1G9Y_Qve48H" role="3cpWs9">
+                    <property role="TrG5h" value="traceEvents" />
+                    <node concept="3uibUv" id="1G9Y_Qve48I" role="1tU5fm">
+                      <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+                    </node>
+                    <node concept="2OqwBi" id="1G9Y_Qve48J" role="33vP2m">
+                      <node concept="37vLTw" id="1G9Y_Qve48K" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBPBGIr" resolve="effect" />
+                      </node>
+                      <node concept="liA8E" id="1G9Y_Qve48L" role="2OqNvi">
+                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
+                        <node concept="10M0yZ" id="1G9Y_Qve48M" role="37wK5m">
+                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
+                          <ref role="3cqZAo" node="1G9Y_Qv7rZx" resolve="TRACE_EVENTS" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbJ" id="1G9Y_Qve49r" role="3cqZAp">
+                  <node concept="3clFbS" id="1G9Y_Qve49s" role="3clFbx">
+                    <node concept="3clFbF" id="1G9Y_Qve49t" role="3cqZAp">
+                      <node concept="1rXfSq" id="1G9Y_Qve49u" role="3clFbG">
+                        <ref role="37wK5l" node="1G9Y_Qva5KG" resolve="addTraceEvents" />
+                        <node concept="37vLTw" id="1G9Y_Qve49v" role="37wK5m">
+                          <ref role="3cqZAo" node="1G9Y_Qve48H" resolve="traceEvents" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3y3z36" id="1G9Y_Qve49w" role="3clFbw">
+                    <node concept="10Nm6u" id="1G9Y_Qve49x" role="3uHU7w" />
+                    <node concept="37vLTw" id="1G9Y_Qve49y" role="3uHU7B">
+                      <ref role="3cqZAo" node="1G9Y_Qve48H" resolve="traceEvents" />
+                    </node>
+                  </node>
+                </node>
                 <node concept="3clFbH" id="2daneBPBGHN" role="3cqZAp" />
               </node>
               <node concept="TDmWw" id="2BZXJed2JyZ" role="TEbGg">
@@ -6010,412 +6912,7 @@
       </node>
     </node>
     <node concept="2tJIrI" id="1FOQehxonMc" role="jymVt" />
-    <node concept="3clFb_" id="3IIf9OAgpFT" role="jymVt">
-      <property role="TrG5h" value="calcConverts" />
-      <node concept="37vLTG" id="3IIf9OAgpZx" role="3clF46">
-        <property role="TrG5h" value="source" />
-        <node concept="3Tqbb2" id="3IIf9OAgs8v" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="3IIf9OAgs8X" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3Tqbb2" id="3IIf9OAgspX" role="1tU5fm" />
-      </node>
-      <node concept="10P_77" id="3IIf9OAgqhD" role="3clF45" />
-      <node concept="3Tm6S6" id="1FOQehwZSVN" role="1B3o_S" />
-      <node concept="3clFbS" id="3IIf9OAgpFX" role="3clF47">
-        <node concept="3cpWs8" id="3IIf9OAgvDK" role="3cqZAp">
-          <node concept="3cpWsn" id="3IIf9OAgvDL" role="3cpWs9">
-            <property role="TrG5h" value="helpers" />
-            <node concept="_YKpA" id="3KN3A4vGHYf" role="1tU5fm">
-              <node concept="3uibUv" id="3KN3A4vGHYg" role="_ZDj9">
-                <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
-              </node>
-            </node>
-            <node concept="1rXfSq" id="1FOQehxo9Cz" role="33vP2m">
-              <ref role="37wK5l" node="3KN3A4vEXni" resolve="helpers" />
-              <node concept="2ShNRf" id="1FOQehxocJV" role="37wK5m">
-                <node concept="Tc6Ow" id="1FOQehxocJW" role="2ShVmc">
-                  <node concept="3Tqbb2" id="1FOQehxocJX" role="HW$YZ" />
-                  <node concept="37vLTw" id="1FOQehxocJY" role="HW$Y0">
-                    <ref role="3cqZAo" node="3IIf9OAgpZx" resolve="source" />
-                  </node>
-                  <node concept="37vLTw" id="1FOQehxocJZ" role="HW$Y0">
-                    <ref role="3cqZAo" node="3IIf9OAgs8X" resolve="target" />
-                  </node>
-                </node>
-              </node>
-              <node concept="10M0yZ" id="1FOQehxo9MY" role="37wK5m">
-                <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-                <ref role="3cqZAo" node="4t7Xo7inO_s" resolve="CONVERT" />
-              </node>
-              <node concept="37vLTw" id="4pwDyRB_i7N" role="37wK5m">
-                <ref role="3cqZAo" node="3IIf9OAgpZx" resolve="source" />
-              </node>
-              <node concept="37vLTw" id="4pwDyRB_jap" role="37wK5m">
-                <ref role="3cqZAo" node="3IIf9OAgs8X" resolve="target" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3KN3A4vGJ3f" role="3cqZAp" />
-        <node concept="1DcWWT" id="3KN3A4vLuiv" role="3cqZAp">
-          <node concept="3clFbS" id="3KN3A4vLuiy" role="2LFqv$">
-            <node concept="SfApY" id="2BZXJecZP8N" role="3cqZAp">
-              <node concept="3clFbS" id="2BZXJecZP8P" role="SfCbr">
-                <node concept="3cpWs8" id="2daneBPBKoA" role="3cqZAp">
-                  <node concept="3cpWsn" id="2daneBPBKoB" role="3cpWs9">
-                    <property role="TrG5h" value="effect" />
-                    <node concept="3uibUv" id="2daneBPBKoC" role="1tU5fm">
-                      <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-                      <node concept="3qTvmN" id="3bpBM3PiBsA" role="11_B2D" />
-                    </node>
-                    <node concept="2OqwBi" id="2daneBPBKoD" role="33vP2m">
-                      <node concept="37vLTw" id="2daneBPBKoE" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3KN3A4vLuiz" resolve="helper" />
-                      </node>
-                      <node concept="liA8E" id="2daneBPBKoF" role="2OqNvi">
-                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="2daneBPBKoG" role="3cqZAp">
-                  <node concept="3cpWsn" id="2daneBPBKoH" role="3cpWs9">
-                    <property role="TrG5h" value="reportItems" />
-                    <node concept="_YKpA" id="2daneBPBKoI" role="1tU5fm">
-                      <node concept="3uibUv" id="2daneBPBKoJ" role="_ZDj9">
-                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="2daneBPBKoK" role="33vP2m">
-                      <node concept="37vLTw" id="2daneBPBKoL" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2daneBPBKoB" resolve="effect" />
-                      </node>
-                      <node concept="liA8E" id="2daneBPBKoM" role="2OqNvi">
-                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                        <node concept="10M0yZ" id="2daneBPBKoN" role="37wK5m">
-                          <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
-                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2daneBPBKps" role="3cqZAp">
-                  <node concept="1rXfSq" id="2daneBPBKpt" role="3clFbG">
-                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
-                    <node concept="37vLTw" id="2daneBPBKpu" role="37wK5m">
-                      <ref role="3cqZAo" node="2daneBPBKoH" resolve="reportItems" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="1FOQehxofbl" role="3cqZAp" />
-              </node>
-              <node concept="TDmWw" id="2BZXJecZP8Q" role="TEbGg">
-                <node concept="3cpWsn" id="2BZXJecZP8S" role="TDEfY">
-                  <property role="TrG5h" value="ex" />
-                  <node concept="3uibUv" id="2BZXJecZPm3" role="1tU5fm">
-                    <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="2BZXJecZP8W" role="TDEfX">
-                  <node concept="3clFbJ" id="1FOQehxyx$2" role="3cqZAp">
-                    <node concept="3clFbS" id="1FOQehxyx$3" role="3clFbx">
-                      <node concept="3clFbF" id="1FOQehxyx$4" role="3cqZAp">
-                        <node concept="2OqwBi" id="1FOQehxyx$5" role="3clFbG">
-                          <node concept="37vLTw" id="1FOQehxyx$6" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
-                          </node>
-                          <node concept="liA8E" id="1FOQehxyx$7" role="2OqNvi">
-                            <ref role="37wK5l" to="1yqb:5KrJ7UHMRSa" resolve="report" />
-                            <node concept="2ShNRf" id="1FOQehxyx$8" role="37wK5m">
-                              <node concept="1pGfFk" id="1FOQehxyx$9" role="2ShVmc">
-                                <ref role="37wK5l" node="1FOQehxyAYy" resolve="LaunchProblemReportItem" />
-                                <node concept="Rm8GO" id="1FOQehxyx$a" role="37wK5m">
-                                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-                                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
-                                </node>
-                                <node concept="Xl_RD" id="1FOQehxyx$b" role="37wK5m">
-                                  <property role="Xl_RC" value="error launching typechecking" />
-                                </node>
-                                <node concept="37vLTw" id="1FOQehxyDr1" role="37wK5m">
-                                  <ref role="3cqZAo" node="2BZXJecZP8S" resolve="ex" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3y3z36" id="1FOQehxyx$c" role="3clFbw">
-                      <node concept="10Nm6u" id="1FOQehxyx$d" role="3uHU7w" />
-                      <node concept="37vLTw" id="1FOQehxyx$e" role="3uHU7B">
-                        <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3SKdUt" id="3KN3A4vLXzP" role="3cqZAp">
-                    <node concept="1PaTwC" id="3KN3A4vLXzQ" role="3ndbpf">
-                      <node concept="3oM_SD" id="3KN3A4vM2Fr" role="1PaTwD">
-                        <property role="3oM_SC" value="return" />
-                      </node>
-                      <node concept="3oM_SD" id="3KN3A4vM2G9" role="1PaTwD">
-                        <property role="3oM_SC" value="false" />
-                      </node>
-                      <node concept="3oM_SD" id="3KN3A4vM2GS" role="1PaTwD">
-                        <property role="3oM_SC" value="on" />
-                      </node>
-                      <node concept="3oM_SD" id="3KN3A4vM2GW" role="1PaTwD">
-                        <property role="3oM_SC" value="error" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWs6" id="2BZXJecZP$A" role="3cqZAp">
-                    <node concept="3clFbT" id="2BZXJecZPVl" role="3cqZAk">
-                      <property role="3clFbU" value="false" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="3KN3A4vLuiz" role="1Duv9x">
-            <property role="TrG5h" value="helper" />
-            <node concept="3uibUv" id="3KN3A4vLuiB" role="1tU5fm">
-              <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="3KN3A4vLuiC" role="1DdaDG">
-            <ref role="3cqZAo" node="3IIf9OAgvDL" resolve="helpers" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="3KN3A4vLOjh" role="3cqZAp" />
-        <node concept="3cpWs6" id="2BZXJecZTz9" role="3cqZAp">
-          <node concept="3clFbT" id="2BZXJecZTXe" role="3cqZAk">
-            <property role="3clFbU" value="true" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="6QH_LDtaCb7" role="jymVt" />
-    <node concept="3clFb_" id="7Bx7XgEiqaI" role="jymVt">
-      <property role="TrG5h" value="calcCoerce" />
-      <node concept="37vLTG" id="7Bx7XgEiqaJ" role="3clF46">
-        <property role="TrG5h" value="source" />
-        <node concept="3Tqbb2" id="7Bx7XgEiqaK" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="7Bx7XgEiqaL" role="3clF46">
-        <property role="TrG5h" value="target" />
-        <node concept="3bZ5Sz" id="7Bx7XgEiuBL" role="1tU5fm" />
-      </node>
-      <node concept="3Tqbb2" id="4pwDyRBs7L$" role="3clF45" />
-      <node concept="3Tm6S6" id="7Bx7XgEiqaO" role="1B3o_S" />
-      <node concept="3clFbS" id="7Bx7XgEiqaP" role="3clF47">
-        <node concept="3cpWs8" id="4pwDyRBsdy6" role="3cqZAp">
-          <node concept="3cpWsn" id="4pwDyRBsdy7" role="3cpWs9">
-            <property role="TrG5h" value="lresult" />
-            <node concept="3uibUv" id="4pwDyRBsdy8" role="1tU5fm">
-              <ref role="3uigEE" to="z9ve:~LogicalImpl" resolve="LogicalImpl" />
-              <node concept="3Tqbb2" id="4pwDyRBsdy9" role="11_B2D" />
-            </node>
-            <node concept="2ShNRf" id="4pwDyRBsdya" role="33vP2m">
-              <node concept="1pGfFk" id="4pwDyRBsdyb" role="2ShVmc">
-                <ref role="37wK5l" to="z9ve:~LogicalImpl.&lt;init&gt;(java.lang.String)" resolve="LogicalImpl" />
-                <node concept="3Tqbb2" id="4pwDyRBshWN" role="1pMfVU" />
-                <node concept="Xl_RD" id="4pwDyRBsi7v" role="37wK5m">
-                  <property role="Xl_RC" value="result" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3KN3A4vMcDB" role="3cqZAp" />
-        <node concept="3cpWs8" id="7Bx7XgEiqaQ" role="3cqZAp">
-          <node concept="3cpWsn" id="7Bx7XgEiqaR" role="3cpWs9">
-            <property role="TrG5h" value="helpers" />
-            <node concept="_YKpA" id="3KN3A4vGNbz" role="1tU5fm">
-              <node concept="3uibUv" id="3KN3A4vGNb$" role="_ZDj9">
-                <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
-              </node>
-            </node>
-            <node concept="1rXfSq" id="7Bx7XgEiqaT" role="33vP2m">
-              <ref role="37wK5l" node="3KN3A4vEXni" resolve="helpers" />
-              <node concept="2ShNRf" id="7Bx7XgEiqaU" role="37wK5m">
-                <node concept="Tc6Ow" id="7Bx7XgEiqaV" role="2ShVmc">
-                  <node concept="3Tqbb2" id="4pwDyRAFapp" role="HW$YZ" />
-                  <node concept="37vLTw" id="7Bx7XgEiqaX" role="HW$Y0">
-                    <ref role="3cqZAo" node="7Bx7XgEiqaJ" resolve="source" />
-                  </node>
-                </node>
-              </node>
-              <node concept="10M0yZ" id="7Bx7XgEixyk" role="37wK5m">
-                <ref role="3cqZAo" node="7Bx7XgEgdEp" resolve="COERCE" />
-                <ref role="1PxDUh" node="4t7Xo7inNgi" resolve="TypecheckingQueryKind" />
-              </node>
-              <node concept="37vLTw" id="4pwDyRB_s2y" role="37wK5m">
-                <ref role="3cqZAo" node="7Bx7XgEiqaJ" resolve="source" />
-              </node>
-              <node concept="37vLTw" id="4pwDyRB_sR2" role="37wK5m">
-                <ref role="3cqZAo" node="7Bx7XgEiqaL" resolve="target" />
-              </node>
-              <node concept="37vLTw" id="4pwDyRBsoUq" role="37wK5m">
-                <ref role="3cqZAo" node="4pwDyRBsdy7" resolve="lresult" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="3KN3A4vM2Ip" role="3cqZAp" />
-        <node concept="1DcWWT" id="3KN3A4vMmtg" role="3cqZAp">
-          <node concept="3clFbS" id="3KN3A4vMmtj" role="2LFqv$">
-            <node concept="SfApY" id="7Bx7XgEiqb3" role="3cqZAp">
-              <node concept="3clFbS" id="7Bx7XgEiqb4" role="SfCbr">
-                <node concept="3cpWs8" id="2daneBPBRVH" role="3cqZAp">
-                  <node concept="3cpWsn" id="2daneBPBRVI" role="3cpWs9">
-                    <property role="TrG5h" value="effect" />
-                    <node concept="3uibUv" id="2daneBPBRVJ" role="1tU5fm">
-                      <ref role="3uigEE" to="1yqb:2daneBOWXQd" resolve="Effect" />
-                      <node concept="3qTvmN" id="3bpBM3PiB_R" role="11_B2D" />
-                    </node>
-                    <node concept="2OqwBi" id="2daneBPBRVK" role="33vP2m">
-                      <node concept="37vLTw" id="2daneBPBRVL" role="2Oq$k0">
-                        <ref role="3cqZAo" node="3KN3A4vMmtk" resolve="helper" />
-                      </node>
-                      <node concept="liA8E" id="2daneBPBRVM" role="2OqNvi">
-                        <ref role="37wK5l" to="1yqb:2daneBP$ovk" resolve="executeAndWait" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3cpWs8" id="2daneBPBRVN" role="3cqZAp">
-                  <node concept="3cpWsn" id="2daneBPBRVO" role="3cpWs9">
-                    <property role="TrG5h" value="reportItems" />
-                    <node concept="_YKpA" id="2daneBPBRVP" role="1tU5fm">
-                      <node concept="3uibUv" id="2daneBPBRVQ" role="_ZDj9">
-                        <ref role="3uigEE" to="d6hs:~ReportItem" resolve="ReportItem" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="2daneBPBRVR" role="33vP2m">
-                      <node concept="37vLTw" id="2daneBPBRVS" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2daneBPBRVI" resolve="effect" />
-                      </node>
-                      <node concept="liA8E" id="2daneBPBRVT" role="2OqNvi">
-                        <ref role="37wK5l" to="1yqb:2daneBOX8cN" resolve="getValue" />
-                        <node concept="10M0yZ" id="2daneBPBRVU" role="37wK5m">
-                          <ref role="3cqZAo" node="2daneBP_Jiy" resolve="REPORT_ITEMS" />
-                          <ref role="1PxDUh" node="NKt6yn81z$" resolve="TypecheckingStep" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbF" id="2daneBPBRWz" role="3cqZAp">
-                  <node concept="1rXfSq" id="2daneBPBRW$" role="3clFbG">
-                    <ref role="37wK5l" node="1FOQehxolKb" resolve="forwardReportItems" />
-                    <node concept="37vLTw" id="2daneBPBRW_" role="37wK5m">
-                      <ref role="3cqZAo" node="2daneBPBRVO" resolve="reportItems" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="7Bx7XgEiqbw" role="3cqZAp" />
-                <node concept="3clFbJ" id="3KN3A4vMEVj" role="3cqZAp">
-                  <node concept="3clFbS" id="3KN3A4vMEVl" role="3clFbx">
-                    <node concept="3cpWs6" id="7Bx7XgEiqbx" role="3cqZAp">
-                      <node concept="2OqwBi" id="3KN3A4uTMpt" role="3cqZAk">
-                        <node concept="2OqwBi" id="3KN3A4uTMpu" role="2Oq$k0">
-                          <node concept="37vLTw" id="3KN3A4uTMpv" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4pwDyRBsdy7" resolve="lresult" />
-                          </node>
-                          <node concept="liA8E" id="3KN3A4uTMpw" role="2OqNvi">
-                            <ref role="37wK5l" to="z9ve:~LogicalImpl.findRoot()" resolve="findRoot" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="3KN3A4uTMpx" role="2OqNvi">
-                          <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="3KN3A4vMLSK" role="3clFbw">
-                    <node concept="2OqwBi" id="3KN3A4vMKQL" role="2Oq$k0">
-                      <node concept="37vLTw" id="3KN3A4vMKn3" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4pwDyRBsdy7" resolve="lresult" />
-                      </node>
-                      <node concept="liA8E" id="3KN3A4vMLoQ" role="2OqNvi">
-                        <ref role="37wK5l" to="z9ve:~LogicalImpl.findRoot()" resolve="findRoot" />
-                      </node>
-                    </node>
-                    <node concept="liA8E" id="3KN3A4vMMk8" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="7Bx7XgEiqbz" role="3cqZAp" />
-              </node>
-              <node concept="TDmWw" id="7Bx7XgEiqb$" role="TEbGg">
-                <node concept="3cpWsn" id="7Bx7XgEiqb_" role="TDEfY">
-                  <property role="TrG5h" value="ex" />
-                  <node concept="3uibUv" id="7Bx7XgEiqbA" role="1tU5fm">
-                    <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="7Bx7XgEiqbB" role="TDEfX">
-                  <node concept="3clFbJ" id="7Bx7XgEiqbC" role="3cqZAp">
-                    <node concept="3clFbS" id="7Bx7XgEiqbD" role="3clFbx">
-                      <node concept="3clFbF" id="7Bx7XgEiqbE" role="3cqZAp">
-                        <node concept="2OqwBi" id="7Bx7XgEiqbF" role="3clFbG">
-                          <node concept="37vLTw" id="7Bx7XgEiqbG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
-                          </node>
-                          <node concept="liA8E" id="7Bx7XgEiqbH" role="2OqNvi">
-                            <ref role="37wK5l" to="1yqb:5KrJ7UHMRSa" resolve="report" />
-                            <node concept="2ShNRf" id="7Bx7XgEiqbI" role="37wK5m">
-                              <node concept="1pGfFk" id="7Bx7XgEiqbJ" role="2ShVmc">
-                                <ref role="37wK5l" node="1FOQehxyAYy" resolve="LaunchProblemReportItem" />
-                                <node concept="Rm8GO" id="7Bx7XgEiqbK" role="37wK5m">
-                                  <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
-                                  <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
-                                </node>
-                                <node concept="Xl_RD" id="7Bx7XgEiqbL" role="37wK5m">
-                                  <property role="Xl_RC" value="error launching typechecking" />
-                                </node>
-                                <node concept="37vLTw" id="7Bx7XgEiqbM" role="37wK5m">
-                                  <ref role="3cqZAo" node="7Bx7XgEiqb_" resolve="ex" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3y3z36" id="7Bx7XgEiqbN" role="3clFbw">
-                      <node concept="10Nm6u" id="7Bx7XgEiqbO" role="3uHU7w" />
-                      <node concept="37vLTw" id="7Bx7XgEiqbP" role="3uHU7B">
-                        <ref role="3cqZAo" node="5KrJ7UHMZjn" resolve="reportSink" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="3KN3A4vNmiH" role="3cqZAp" />
-                  <node concept="3zACq4" id="3KN3A4vNh48" role="3cqZAp" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="3KN3A4vMmtk" role="1Duv9x">
-            <property role="TrG5h" value="helper" />
-            <node concept="3uibUv" id="3KN3A4vMmto" role="1tU5fm">
-              <ref role="3uigEE" to="1yqb:1pPth$l_TFV" resolve="CoderulesHelper" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="3KN3A4vMmtp" role="1DdaDG">
-            <ref role="3cqZAo" node="7Bx7XgEiqaR" resolve="helpers" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="3KN3A4vNrrV" role="3cqZAp" />
-        <node concept="3cpWs6" id="7Bx7XgEiqbR" role="3cqZAp">
-          <node concept="10Nm6u" id="4pwDyRBsDXc" role="3cqZAk" />
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="7Bx7XgEiqaH" role="jymVt" />
     <node concept="3clFb_" id="1FOQehxnBew" role="jymVt">
       <property role="TrG5h" value="helpers" />
@@ -6871,6 +7368,43 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="1G9Y_Qv9VYx" role="jymVt" />
+    <node concept="3clFb_" id="1G9Y_Qva5KG" role="jymVt">
+      <property role="TrG5h" value="addTraceEvents" />
+      <node concept="37vLTG" id="1G9Y_QvaVi4" role="3clF46">
+        <property role="TrG5h" value="traceEvents" />
+        <node concept="3uibUv" id="1G9Y_QvaZfH" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="1G9Y_Qva5KI" role="3clF45" />
+      <node concept="3Tm1VV" id="1G9Y_Qva5KJ" role="1B3o_S" />
+      <node concept="3clFbS" id="1G9Y_Qva5KK" role="3clF47">
+        <node concept="3clFbJ" id="1G9Y_QvbgV_" role="3cqZAp">
+          <node concept="3clFbS" id="1G9Y_QvbgVB" role="3clFbx">
+            <node concept="3clFbF" id="1G9Y_QvbkxP" role="3cqZAp">
+              <node concept="2OqwBi" id="1G9Y_Qvbo5P" role="3clFbG">
+                <node concept="37vLTw" id="1G9Y_QvbmTa" role="2Oq$k0">
+                  <ref role="3cqZAo" node="1G9Y_Qvb9QJ" resolve="traceObject" />
+                </node>
+                <node concept="liA8E" id="1G9Y_QvboWN" role="2OqNvi">
+                  <ref role="37wK5l" to="1yqb:1G9Y_Qvb2Ov" resolve="addTraceEvents" />
+                  <node concept="37vLTw" id="1G9Y_Qvbp8x" role="37wK5m">
+                    <ref role="3cqZAo" node="1G9Y_QvaVi4" resolve="traceEvents" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="1G9Y_Qvbjcf" role="3clFbw">
+            <node concept="10Nm6u" id="1G9Y_Qvbkml" role="3uHU7w" />
+            <node concept="37vLTw" id="1G9Y_Qvbieb" role="3uHU7B">
+              <ref role="3cqZAo" node="1G9Y_Qvb9QJ" resolve="traceObject" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="1FOQehxnD2p" role="jymVt" />
     <node concept="2YIFZL" id="3IIf9O_tL1f" role="jymVt">
       <property role="TrG5h" value="repository" />
@@ -6996,6 +7530,13 @@
         <ref role="3uigEE" to="1yqb:5KrJ7UHMRRs" resolve="ReportSink" />
       </node>
     </node>
+    <node concept="312cEg" id="1G9Y_Qvb9QJ" role="jymVt">
+      <property role="TrG5h" value="traceObject" />
+      <node concept="3Tm6S6" id="1G9Y_Qvb9QK" role="1B3o_S" />
+      <node concept="3uibUv" id="1G9Y_Qvbf6k" role="1tU5fm">
+        <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+      </node>
+    </node>
     <node concept="3UR2Jj" id="6$gg4kBQMAn" role="lGtFl">
       <node concept="TZ5HA" id="6$gg4kBQMAo" role="TZ5H$">
         <node concept="1dT_AC" id="6$gg4kBQMAp" role="1dT_Ay">
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 58688c38..4bed5065 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -89,6 +89,7 @@
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
     <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
     <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
+    <import index="7bx7" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.workbench.action(MPS.Platform/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -6098,12 +6099,6 @@
           <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
         </node>
       </node>
-      <node concept="37vLTG" id="6QkkSolfr_S" role="3clF46">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3uibUv" id="6QkkSolfr_T" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-      </node>
       <node concept="3cqZAl" id="6QkkSolfrrw" role="3clF45" />
       <node concept="3Tm1VV" id="6QkkSolfrrx" role="1B3o_S" />
       <node concept="3clFbS" id="6QkkSolfrry" role="3clF47">
@@ -6121,9 +6116,6 @@
                 <node concept="37vLTw" id="6QkkSolM_GC" role="37wK5m">
                   <ref role="3cqZAo" node="6QkkSolfr_O" resolve="mpsProject" />
                 </node>
-                <node concept="37vLTw" id="6QkkSolM_GE" role="37wK5m">
-                  <ref role="3cqZAo" node="6QkkSolfr_S" resolve="editorComponent" />
-                </node>
               </node>
             </node>
           </node>
@@ -6131,33 +6123,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="YGS68MKBWq" role="jymVt" />
-    <node concept="3clFb_" id="YGS68MKBWr" role="jymVt">
-      <property role="TrG5h" value="setContextEditorComponent" />
-      <node concept="37vLTG" id="YGS68MKBWs" role="3clF46">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3uibUv" id="YGS68MKBWt" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="YGS68MKBWu" role="3clF45" />
-      <node concept="3Tm1VV" id="YGS68MKBWv" role="1B3o_S" />
-      <node concept="3clFbS" id="YGS68MKBWw" role="3clF47">
-        <node concept="3clFbF" id="YGS68MKBWx" role="3cqZAp">
-          <node concept="2OqwBi" id="YGS68MKBWy" role="3clFbG">
-            <node concept="37vLTw" id="YGS68MKBWz" role="2Oq$k0">
-              <ref role="3cqZAo" node="6QkkSolM_Gm" resolve="treeCellInfoFactory" />
-            </node>
-            <node concept="liA8E" id="YGS68MKBW$" role="2OqNvi">
-              <ref role="37wK5l" node="YGS68MKxkL" resolve="setContextEditorComponent" />
-              <node concept="37vLTw" id="YGS68MKBW_" role="37wK5m">
-                <ref role="3cqZAo" node="YGS68MKBWs" resolve="editorComponent" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6QkkSolfrRo" role="jymVt" />
     <node concept="3clFb_" id="6QkkSolfs4o" role="jymVt">
       <property role="TrG5h" value="columns" />
       <node concept="_YKpA" id="6QkkSolfs4p" role="3clF45">
@@ -9188,6 +9153,28 @@
               </node>
               <node concept="3eNFk2" id="428_4iYyOqt" role="3eNLev">
                 <node concept="3clFbS" id="428_4iYyOqu" role="3eOfB_">
+                  <node concept="3SKdUt" id="2qsG4AwPtgt" role="3cqZAp">
+                    <node concept="1PaTwC" id="2qsG4AwPtgu" role="3ndbpf">
+                      <node concept="3oM_SD" id="2qsG4AwPtgw" role="1PaTwD">
+                        <property role="3oM_SC" value="FIXME:" />
+                      </node>
+                      <node concept="3oM_SD" id="2qsG4AwPt_y" role="1PaTwD">
+                        <property role="3oM_SC" value="enable" />
+                      </node>
+                      <node concept="3oM_SD" id="2qsG4AwPu3P" role="1PaTwD">
+                        <property role="3oM_SC" value="back" />
+                      </node>
+                      <node concept="3oM_SD" id="2qsG4AwPuj1" role="1PaTwD">
+                        <property role="3oM_SC" value="the" />
+                      </node>
+                      <node concept="3oM_SD" id="2qsG4AwPuqE" role="1PaTwD">
+                        <property role="3oM_SC" value="editor-based" />
+                      </node>
+                      <node concept="3oM_SD" id="2qsG4AwPuIk" role="1PaTwD">
+                        <property role="3oM_SC" value="rendering" />
+                      </node>
+                    </node>
+                  </node>
                   <node concept="3cpWs8" id="428_4iYyOqv" role="3cqZAp">
                     <node concept="3cpWsn" id="428_4iYyOqw" role="3cpWs9">
                       <property role="TrG5h" value="selection" />
@@ -9403,14 +9390,17 @@
                     </node>
                   </node>
                   <node concept="1Wc70l" id="428_4iYyOrO" role="3uHU7B">
-                    <node concept="3y3z36" id="428_4iYyOrP" role="3uHU7B">
-                      <node concept="10Nm6u" id="428_4iYyOrQ" role="3uHU7w" />
-                      <node concept="2OqwBi" id="428_4iYyOrR" role="3uHU7B">
-                        <node concept="37vLTw" id="428_4iYyOrS" role="2Oq$k0">
-                          <ref role="3cqZAo" node="428_4iYyOpE" resolve="snode" />
-                        </node>
-                        <node concept="liA8E" id="428_4iYyOrT" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getParent()" resolve="getParent" />
+                    <node concept="1Wc70l" id="2qsG4AwOa1z" role="3uHU7B">
+                      <node concept="3clFbT" id="2qsG4AwOagh" role="3uHU7B" />
+                      <node concept="3y3z36" id="428_4iYyOrP" role="3uHU7w">
+                        <node concept="10Nm6u" id="428_4iYyOrQ" role="3uHU7w" />
+                        <node concept="2OqwBi" id="428_4iYyOrR" role="3uHU7B">
+                          <node concept="37vLTw" id="428_4iYyOrS" role="2Oq$k0">
+                            <ref role="3cqZAo" node="428_4iYyOpE" resolve="snode" />
+                          </node>
+                          <node concept="liA8E" id="428_4iYyOrT" role="2OqNvi">
+                            <ref role="37wK5l" to="mhbf:~SNode.getParent()" resolve="getParent" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -12376,7 +12366,6 @@
                 <node concept="37vLTw" id="YGS68MLdsp" role="37wK5m">
                   <ref role="3cqZAo" node="5X6ji59zkk1" resolve="mpsProject" />
                 </node>
-                <node concept="10Nm6u" id="YGS68MLdNC" role="37wK5m" />
               </node>
             </node>
           </node>
@@ -12395,7 +12384,6 @@
                 <node concept="37vLTw" id="YGS68MKFWA" role="37wK5m">
                   <ref role="3cqZAo" node="5X6ji59zkk1" resolve="mpsProject" />
                 </node>
-                <node concept="10Nm6u" id="YGS68MKGkE" role="37wK5m" />
               </node>
             </node>
           </node>
@@ -14791,46 +14779,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5X6ji59zpuL" role="jymVt" />
-    <node concept="3clFb_" id="6_UQWSXcgLF" role="jymVt">
-      <property role="TrG5h" value="setContextEditorComponent" />
-      <node concept="37vLTG" id="6_UQWSXcpx1" role="3clF46">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3uibUv" id="6_UQWSXcrhN" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="6_UQWSXcgLH" role="3clF45" />
-      <node concept="3Tm1VV" id="6_UQWSXcgLI" role="1B3o_S" />
-      <node concept="3clFbS" id="6_UQWSXcgLJ" role="3clF47">
-        <node concept="3clFbF" id="YGS68MLqo$" role="3cqZAp">
-          <node concept="2OqwBi" id="YGS68MLqz$" role="3clFbG">
-            <node concept="37vLTw" id="YGS68MLqoy" role="2Oq$k0">
-              <ref role="3cqZAo" node="YGS68MKD$W" resolve="activationColumns" />
-            </node>
-            <node concept="liA8E" id="YGS68MLqAV" role="2OqNvi">
-              <ref role="37wK5l" node="YGS68MK$oM" resolve="setContextEditorComponent" />
-              <node concept="37vLTw" id="YGS68MLqUW" role="37wK5m">
-                <ref role="3cqZAo" node="6_UQWSXcpx1" resolve="editorComponent" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="YGS68MLqVr" role="3cqZAp">
-          <node concept="2OqwBi" id="YGS68MLqVs" role="3clFbG">
-            <node concept="37vLTw" id="YGS68MLrhV" role="2Oq$k0">
-              <ref role="3cqZAo" node="YGS68MLaS8" resolve="storeColumns" />
-            </node>
-            <node concept="liA8E" id="YGS68MLqVu" role="2OqNvi">
-              <ref role="37wK5l" node="YGS68MKBWr" resolve="setContextEditorComponent" />
-              <node concept="37vLTw" id="YGS68MLqVv" role="37wK5m">
-                <ref role="3cqZAo" node="6_UQWSXcpx1" resolve="editorComponent" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="6_UQWSXceHj" role="jymVt" />
     <node concept="3clFb_" id="5X6ji59xVZa" role="jymVt">
       <property role="TrG5h" value="refreshActivation" />
       <node concept="3cqZAl" id="5X6ji59xVZc" role="3clF45" />
@@ -17155,12 +17103,6 @@
             <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
           </node>
         </node>
-        <node concept="37vLTG" id="6QkkSolKyZY" role="3clF46">
-          <property role="TrG5h" value="editorComponent" />
-          <node concept="3uibUv" id="6QkkSolKyZZ" role="1tU5fm">
-            <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-          </node>
-        </node>
         <node concept="3cqZAl" id="6QkkSolKyWk" role="3clF45" />
         <node concept="3Tm1VV" id="6QkkSolKyWl" role="1B3o_S" />
         <node concept="3clFbS" id="6QkkSolKyWm" role="3clF47">
@@ -17177,19 +17119,6 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="6QkkSolKzbt" role="3cqZAp">
-            <node concept="37vLTI" id="6QkkSolKzbv" role="3clFbG">
-              <node concept="2OqwBi" id="6QkkSolKzbz" role="37vLTJ">
-                <node concept="Xjq3P" id="6QkkSolKzbA" role="2Oq$k0" />
-                <node concept="2OwXpG" id="6QkkSolKzby" role="2OqNvi">
-                  <ref role="2Oxat5" node="6QkkSolKzbp" resolve="editorComponent" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="6QkkSolKzbB" role="37vLTx">
-                <ref role="3cqZAo" node="6QkkSolKyZY" resolve="editorComponent" />
-              </node>
-            </node>
-          </node>
           <node concept="3clFbF" id="428_4iYzhrc" role="3cqZAp">
             <node concept="37vLTI" id="428_4iYzhrd" role="3clFbG">
               <node concept="2OqwBi" id="428_4iYzhre" role="37vLTJ">
@@ -17201,9 +17130,7 @@
               <node concept="2ShNRf" id="428_4iYzhrh" role="37vLTx">
                 <node concept="1pGfFk" id="428_4iYzhri" role="2ShVmc">
                   <ref role="37wK5l" node="428_4iYyMCP" resolve="SNodePresentation" />
-                  <node concept="37vLTw" id="428_4iYzhrj" role="37wK5m">
-                    <ref role="3cqZAo" node="6QkkSolKyZY" resolve="editorComponent" />
-                  </node>
+                  <node concept="10Nm6u" id="2qsG4AwO9iW" role="37wK5m" />
                   <node concept="37vLTw" id="428_4iYzhrk" role="37wK5m">
                     <ref role="3cqZAo" node="6QkkSolKyZU" resolve="mpsProject" />
                   </node>
@@ -17214,33 +17141,6 @@
         </node>
       </node>
       <node concept="2tJIrI" id="6QkkSolKzeu" role="jymVt" />
-      <node concept="3clFb_" id="YGS68MKxkL" role="jymVt">
-        <property role="TrG5h" value="setContextEditorComponent" />
-        <node concept="37vLTG" id="YGS68MKxkM" role="3clF46">
-          <property role="TrG5h" value="editorComponent" />
-          <node concept="3uibUv" id="YGS68MKxkN" role="1tU5fm">
-            <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-          </node>
-        </node>
-        <node concept="3cqZAl" id="YGS68MKxkO" role="3clF45" />
-        <node concept="3Tm1VV" id="YGS68MKxkP" role="1B3o_S" />
-        <node concept="3clFbS" id="YGS68MKxkQ" role="3clF47">
-          <node concept="3clFbF" id="YGS68MKxkR" role="3cqZAp">
-            <node concept="37vLTI" id="YGS68MKxkS" role="3clFbG">
-              <node concept="2OqwBi" id="YGS68MKxkT" role="37vLTJ">
-                <node concept="Xjq3P" id="YGS68MKxkU" role="2Oq$k0" />
-                <node concept="2OwXpG" id="YGS68MKxkV" role="2OqNvi">
-                  <ref role="2Oxat5" node="6QkkSolKzbp" resolve="editorComponent" />
-                </node>
-              </node>
-              <node concept="37vLTw" id="YGS68MKxkW" role="37vLTx">
-                <ref role="3cqZAo" node="YGS68MKxkM" resolve="editorComponent" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2tJIrI" id="YGS68MKytA" role="jymVt" />
       <node concept="3clFb_" id="6QkkSolKDEz" role="jymVt">
         <property role="TrG5h" value="forRuleOrigin" />
         <node concept="37vLTG" id="6QkkSolKGTF" role="3clF46">
@@ -18949,13 +18849,6 @@
           <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
         </node>
       </node>
-      <node concept="312cEg" id="6QkkSolKzbp" role="jymVt">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3Tm6S6" id="6QkkSolKzbq" role="1B3o_S" />
-        <node concept="3uibUv" id="6QkkSolKzbs" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-      </node>
       <node concept="312cEg" id="428_4iYzhr2" role="jymVt">
         <property role="TrG5h" value="nodePresentation" />
         <node concept="3Tm6S6" id="428_4iYzhr0" role="1B3o_S" />
@@ -19717,9 +19610,6 @@
                 <node concept="37vLTw" id="6QkkSolLkpy" role="37wK5m">
                   <ref role="3cqZAo" node="62MNP_kWcle" resolve="mpsProject" />
                 </node>
-                <node concept="37vLTw" id="6QkkSolLkp$" role="37wK5m">
-                  <ref role="3cqZAo" node="6_UQWSXcwv3" resolve="editorComponent" />
-                </node>
               </node>
             </node>
           </node>
@@ -19731,39 +19621,6 @@
           <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
         </node>
       </node>
-      <node concept="37vLTG" id="6_UQWSXcwv3" role="3clF46">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3uibUv" id="6_UQWSXcwSs" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="YGS68MK_iH" role="jymVt" />
-    <node concept="3clFb_" id="YGS68MK$oM" role="jymVt">
-      <property role="TrG5h" value="setContextEditorComponent" />
-      <node concept="37vLTG" id="YGS68MK$oN" role="3clF46">
-        <property role="TrG5h" value="editorComponent" />
-        <node concept="3uibUv" id="YGS68MK$oO" role="1tU5fm">
-          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="YGS68MK$oP" role="3clF45" />
-      <node concept="3Tm1VV" id="YGS68MK$oQ" role="1B3o_S" />
-      <node concept="3clFbS" id="YGS68MK$oR" role="3clF47">
-        <node concept="3clFbF" id="YGS68MKAHO" role="3cqZAp">
-          <node concept="2OqwBi" id="YGS68MKAS_" role="3clFbG">
-            <node concept="37vLTw" id="YGS68MKAHM" role="2Oq$k0">
-              <ref role="3cqZAo" node="6QkkSolLkpg" resolve="treeCellInfoFactory" />
-            </node>
-            <node concept="liA8E" id="YGS68MKAVZ" role="2OqNvi">
-              <ref role="37wK5l" node="YGS68MKxkL" resolve="setContextEditorComponent" />
-              <node concept="37vLTw" id="YGS68MKBf$" role="37wK5m">
-                <ref role="3cqZAo" node="YGS68MK$oN" resolve="editorComponent" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
     </node>
     <node concept="2tJIrI" id="62MNP_kWaWD" role="jymVt" />
     <node concept="3clFb_" id="62MNP_kWYWN" role="jymVt">
@@ -23730,7 +23587,102 @@
             <ref role="3uigEE" to="qkt:~DefaultActionGroup" resolve="DefaultActionGroup" />
           </node>
         </node>
-        <node concept="3clFbS" id="7kbj6I74i9p" role="3clF47" />
+        <node concept="3clFbS" id="7kbj6I74i9p" role="3clF47">
+          <node concept="3cpWs8" id="1G9Y_Qv4MTf" role="3cqZAp">
+            <node concept="3cpWsn" id="1G9Y_Qv4MTg" role="3cpWs9">
+              <property role="TrG5h" value="selectedValue" />
+              <node concept="3uibUv" id="1G9Y_Qv4MM4" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+              <node concept="2OqwBi" id="1G9Y_Qv4MTh" role="33vP2m">
+                <node concept="37vLTw" id="1G9Y_Qv4MTi" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7kbj6I74i9l" resolve="list" />
+                </node>
+                <node concept="liA8E" id="1G9Y_Qv4MTj" role="2OqNvi">
+                  <ref role="37wK5l" to="dxuu:~JList.getSelectedValue()" resolve="getSelectedValue" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="1G9Y_Qv51HI" role="3cqZAp" />
+          <node concept="3clFbJ" id="1G9Y_Qv4O9L" role="3cqZAp">
+            <node concept="3clFbS" id="1G9Y_Qv4O9N" role="3clFbx">
+              <node concept="3clFbH" id="1G9Y_Qv77W2" role="3cqZAp" />
+              <node concept="3cpWs8" id="1G9Y_Qv775j" role="3cqZAp">
+                <node concept="3cpWsn" id="1G9Y_Qv775k" role="3cpWs9">
+                  <property role="TrG5h" value="hintObject" />
+                  <node concept="3uibUv" id="1G9Y_Qv774n" role="1tU5fm">
+                    <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                  </node>
+                  <node concept="2OqwBi" id="1G9Y_Qv775l" role="33vP2m">
+                    <node concept="1eOMI4" id="1G9Y_Qv775m" role="2Oq$k0">
+                      <node concept="10QFUN" id="1G9Y_Qv775n" role="1eOMHV">
+                        <node concept="3uibUv" id="1G9Y_Qv775o" role="10QFUM">
+                          <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+                        </node>
+                        <node concept="37vLTw" id="1G9Y_Qv775p" role="10QFUP">
+                          <ref role="3cqZAo" node="1G9Y_Qv4MTg" resolve="selectedValue" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="1G9Y_Qv775q" role="2OqNvi">
+                      <ref role="37wK5l" to="et5u:~IMessage.getHintObject()" resolve="getHintObject" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="1G9Y_Qv7axm" role="3cqZAp">
+                <node concept="2ZW3vV" id="1G9Y_Qv7cLV" role="3clFbw">
+                  <node concept="3uibUv" id="2qsG4AwFpzh" role="2ZW6by">
+                    <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+                  </node>
+                  <node concept="37vLTw" id="1G9Y_Qv7c21" role="2ZW6bz">
+                    <ref role="3cqZAo" node="1G9Y_Qv775k" resolve="hintObject" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="1G9Y_Qv7axo" role="3clFbx">
+                  <node concept="3clFbF" id="1G9Y_Qv266z" role="3cqZAp">
+                    <node concept="2OqwBi" id="1G9Y_Qv26kK" role="3clFbG">
+                      <node concept="37vLTw" id="1G9Y_Qv266y" role="2Oq$k0">
+                        <ref role="3cqZAo" node="7kbj6I74i9n" resolve="group" />
+                      </node>
+                      <node concept="liA8E" id="1G9Y_Qv26IR" role="2OqNvi">
+                        <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
+                        <node concept="2OqwBi" id="1G9Y_Qv6oTQ" role="37wK5m">
+                          <node concept="2ShNRf" id="1G9Y_Qv6jNA" role="2Oq$k0">
+                            <node concept="1pGfFk" id="1G9Y_Qv6oCq" role="2ShVmc">
+                              <ref role="37wK5l" node="1G9Y_Qv5SdQ" resolve="ShowTraceAction" />
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="1G9Y_Qv6pgX" role="2OqNvi">
+                            <ref role="37wK5l" node="2qsG4AwFqpd" resolve="setTraceObject" />
+                            <node concept="10QFUN" id="2qsG4AwFy7X" role="37wK5m">
+                              <node concept="3uibUv" id="2qsG4AwFy7V" role="10QFUM">
+                                <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+                              </node>
+                              <node concept="37vLTw" id="2qsG4AwFy7W" role="10QFUP">
+                                <ref role="3cqZAo" node="1G9Y_Qv775k" resolve="hintObject" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbH" id="1G9Y_Qv51Zg" role="3cqZAp" />
+            </node>
+            <node concept="2ZW3vV" id="1G9Y_Qv4Qqe" role="3clFbw">
+              <node concept="3uibUv" id="1G9Y_Qv4QLb" role="2ZW6by">
+                <ref role="3uigEE" to="et5u:~IMessage" resolve="IMessage" />
+              </node>
+              <node concept="37vLTw" id="1G9Y_Qv4P_x" role="2ZW6bz">
+                <ref role="3cqZAo" node="1G9Y_Qv4MTg" resolve="selectedValue" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="2AHcQZ" id="7kbj6I74i9q" role="2AJF6D">
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
@@ -25861,5 +25813,402 @@
       <ref role="3uigEE" to="31yc:2ceN1hD7bbb" resolve="StoreEventsConsumer" />
     </node>
   </node>
+  <node concept="312cEu" id="1G9Y_Qv5RZC">
+    <property role="TrG5h" value="ShowTraceAction" />
+    <node concept="2tJIrI" id="2qsG4AwFw7U" role="jymVt" />
+    <node concept="Wx3nA" id="1G9Y_Qv5SdM" role="jymVt">
+      <property role="TrG5h" value="ICON" />
+      <property role="3TUv4t" value="true" />
+      <node concept="3uibUv" id="1G9Y_Qv5SdN" role="1tU5fm">
+        <ref role="3uigEE" to="dxuu:~Icon" resolve="Icon" />
+      </node>
+      <node concept="10Nm6u" id="1G9Y_Qv5SdO" role="33vP2m" />
+      <node concept="3Tm6S6" id="1G9Y_Qv5SdP" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwFvNo" role="jymVt" />
+    <node concept="3clFbW" id="1G9Y_Qv5SdQ" role="jymVt">
+      <node concept="3cqZAl" id="1G9Y_Qv5SdR" role="3clF45" />
+      <node concept="3clFbS" id="1G9Y_Qv5SdS" role="3clF47">
+        <node concept="XkiVB" id="1G9Y_Qv5SMc" role="3cqZAp">
+          <ref role="37wK5l" to="7bx7:~BaseAction.&lt;init&gt;(java.lang.String,java.lang.String,javax.swing.Icon)" resolve="BaseAction" />
+          <node concept="Xl_RD" id="1G9Y_Qv5SMd" role="37wK5m">
+            <property role="Xl_RC" value="Show Trace" />
+          </node>
+          <node concept="Xl_RD" id="1G9Y_Qv5SMe" role="37wK5m">
+            <property role="Xl_RC" value="" />
+          </node>
+          <node concept="37vLTw" id="1G9Y_Qv5SMf" role="37wK5m">
+            <ref role="3cqZAo" node="1G9Y_Qv5SdM" resolve="ICON" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="1G9Y_Qv5SdT" role="3cqZAp">
+          <node concept="2OqwBi" id="1G9Y_Qv5SdU" role="3clFbG">
+            <node concept="Xjq3P" id="1G9Y_Qv5SdV" role="2Oq$k0" />
+            <node concept="liA8E" id="1G9Y_Qv5SdW" role="2OqNvi">
+              <ref role="37wK5l" to="7bx7:~BaseAction.setIsAlwaysVisible(boolean)" resolve="setIsAlwaysVisible" />
+              <node concept="3clFbT" id="1G9Y_Qv5SdX" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1G9Y_Qv5SdY" role="3cqZAp">
+          <node concept="2OqwBi" id="1G9Y_Qv5SdZ" role="3clFbG">
+            <node concept="Xjq3P" id="1G9Y_Qv5Se0" role="2Oq$k0" />
+            <node concept="liA8E" id="1G9Y_Qv5Se1" role="2OqNvi">
+              <ref role="37wK5l" to="7bx7:~BaseAction.setExecuteOutsideCommand(boolean)" resolve="setExecuteOutsideCommand" />
+              <node concept="3clFbT" id="1G9Y_Qv5Se2" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1G9Y_Qv5Se7" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwFvuR" role="jymVt" />
+    <node concept="3clFb_" id="1G9Y_Qv5Se8" role="jymVt">
+      <property role="TrG5h" value="isDumbAware" />
+      <node concept="2AHcQZ" id="1G9Y_Qv5Se9" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="3clFbS" id="1G9Y_Qv5Sea" role="3clF47">
+        <node concept="3cpWs6" id="1G9Y_Qv5Seb" role="3cqZAp">
+          <node concept="3clFbT" id="1G9Y_Qv5Sec" role="3cqZAk">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1G9Y_Qv5Sed" role="1B3o_S" />
+      <node concept="10P_77" id="1G9Y_Qv5See" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwFvan" role="jymVt" />
+    <node concept="3clFb_" id="1G9Y_Qv5Sef" role="jymVt">
+      <property role="TrG5h" value="collectActionData" />
+      <node concept="2AHcQZ" id="1G9Y_Qv5Seg" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="37vLTG" id="1G9Y_Qv5Seh" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <node concept="3uibUv" id="1G9Y_Qv5Sei" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1G9Y_Qv5Sej" role="3clF46">
+        <property role="TrG5h" value="_params" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="1G9Y_Qv5Sek" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+          <node concept="3uibUv" id="1G9Y_Qv5Sel" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+          </node>
+          <node concept="3uibUv" id="1G9Y_Qv5Sem" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="1G9Y_Qv5Sen" role="3clF47">
+        <node concept="9aQIb" id="1G9Y_Qv6g$H" role="3cqZAp">
+          <node concept="3clFbS" id="1G9Y_Qv6g$I" role="9aQI4">
+            <node concept="3cpWs8" id="1G9Y_Qv6g$K" role="3cqZAp">
+              <node concept="3cpWsn" id="1G9Y_Qv6g$J" role="3cpWs9">
+                <property role="TrG5h" value="p" />
+                <node concept="3uibUv" id="1G9Y_Qv6hbz" role="1tU5fm">
+                  <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+                </node>
+                <node concept="2OqwBi" id="1G9Y_Qv6gJ1" role="33vP2m">
+                  <node concept="37vLTw" id="1G9Y_Qv6gJ0" role="2Oq$k0">
+                    <ref role="3cqZAo" node="1G9Y_Qv5Seh" resolve="event" />
+                  </node>
+                  <node concept="liA8E" id="1G9Y_Qv6gJ2" role="2OqNvi">
+                    <ref role="37wK5l" to="qkt:~AnActionEvent.getData(com.intellij.openapi.actionSystem.DataKey)" resolve="getData" />
+                    <node concept="10M0yZ" id="1G9Y_Qv6gJ3" role="37wK5m">
+                      <ref role="1PxDUh" to="qkt:~CommonDataKeys" resolve="CommonDataKeys" />
+                      <ref role="3cqZAo" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="1G9Y_Qv6g$O" role="3cqZAp">
+              <node concept="3clFbC" id="1G9Y_Qv6g$P" role="3clFbw">
+                <node concept="37vLTw" id="1G9Y_Qv6g$Q" role="3uHU7B">
+                  <ref role="3cqZAo" node="1G9Y_Qv6g$J" resolve="p" />
+                </node>
+                <node concept="10Nm6u" id="1G9Y_Qv6g$R" role="3uHU7w" />
+              </node>
+              <node concept="3clFbS" id="1G9Y_Qv6g$T" role="3clFbx">
+                <node concept="3cpWs6" id="1G9Y_Qv6g$U" role="3cqZAp">
+                  <node concept="3clFbT" id="1G9Y_Qv6g$V" role="3cqZAk" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1G9Y_Qv6g5j" role="3cqZAp" />
+        <node concept="3cpWs6" id="1G9Y_Qv5Sfe" role="3cqZAp">
+          <node concept="3clFbT" id="1G9Y_Qv5Sff" role="3cqZAk">
+            <property role="3clFbU" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="1G9Y_Qv5Sfg" role="1B3o_S" />
+      <node concept="10P_77" id="1G9Y_Qv5Sfh" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwFuxq" role="jymVt" />
+    <node concept="3clFb_" id="2qsG4AwFqpd" role="jymVt">
+      <property role="TrG5h" value="setTraceObject" />
+      <node concept="37vLTG" id="2qsG4AwFqpe" role="3clF46">
+        <property role="TrG5h" value="traceObject" />
+        <node concept="3uibUv" id="2qsG4AwFrOi" role="1tU5fm">
+          <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="2qsG4AwFqpg" role="3clF45">
+        <ref role="3uigEE" node="1G9Y_Qv5RZC" resolve="ShowTraceAction" />
+      </node>
+      <node concept="3Tm1VV" id="2qsG4AwFqph" role="1B3o_S" />
+      <node concept="3clFbS" id="2qsG4AwFqpi" role="3clF47">
+        <node concept="3clFbF" id="2qsG4AwFqpj" role="3cqZAp">
+          <node concept="37vLTI" id="2qsG4AwFqpk" role="3clFbG">
+            <node concept="2OqwBi" id="2qsG4AwFqpl" role="37vLTJ">
+              <node concept="Xjq3P" id="2qsG4AwFqpm" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2qsG4AwFtP8" role="2OqNvi">
+                <ref role="2Oxat5" node="2qsG4AwFsrf" resolve="traceObject" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2qsG4AwFqpo" role="37vLTx">
+              <ref role="3cqZAo" node="2qsG4AwFqpe" resolve="traceObject" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="2qsG4AwFqpp" role="3cqZAp">
+          <node concept="Xjq3P" id="2qsG4AwFqpq" role="3clFbG" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwFu0T" role="jymVt" />
+    <node concept="3clFb_" id="1G9Y_Qv5Sfi" role="jymVt">
+      <property role="TrG5h" value="doExecute" />
+      <node concept="2AHcQZ" id="1G9Y_Qv5Sfj" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="37vLTG" id="1G9Y_Qv5Sfk" role="3clF46">
+        <property role="TrG5h" value="event" />
+        <property role="3TUv4t" value="true" />
+        <node concept="2AHcQZ" id="1G9Y_Qv5Sfl" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~NotNull" resolve="NotNull" />
+        </node>
+        <node concept="3uibUv" id="1G9Y_Qv5Sfm" role="1tU5fm">
+          <ref role="3uigEE" to="qkt:~AnActionEvent" resolve="AnActionEvent" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="1G9Y_Qv5Sfn" role="3clF46">
+        <property role="TrG5h" value="_params" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="1G9Y_Qv5Sfo" role="1tU5fm">
+          <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
+          <node concept="3uibUv" id="1G9Y_Qv5Sfp" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+          </node>
+          <node concept="3uibUv" id="1G9Y_Qv5Sfq" role="11_B2D">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="1G9Y_Qv5Sfr" role="3clF47">
+        <node concept="3cpWs8" id="2qsG4AwLZm5" role="3cqZAp">
+          <node concept="3cpWsn" id="2qsG4AwLZm6" role="3cpWs9">
+            <property role="TrG5h" value="project" />
+            <node concept="3uibUv" id="2qsG4AwLZh7" role="1tU5fm">
+              <ref role="3uigEE" to="4nm9:~Project" resolve="Project" />
+            </node>
+            <node concept="2OqwBi" id="2qsG4AwLZm7" role="33vP2m">
+              <node concept="37vLTw" id="2qsG4AwLZm8" role="2Oq$k0">
+                <ref role="3cqZAo" node="1G9Y_Qv5Sfk" resolve="event" />
+              </node>
+              <node concept="liA8E" id="2qsG4AwLZm9" role="2OqNvi">
+                <ref role="37wK5l" to="qkt:~AnActionEvent.getData(com.intellij.openapi.actionSystem.DataKey)" resolve="getData" />
+                <node concept="10M0yZ" id="2qsG4AwLZma" role="37wK5m">
+                  <ref role="1PxDUh" to="qkt:~CommonDataKeys" resolve="CommonDataKeys" />
+                  <ref role="3cqZAo" to="qkt:~CommonDataKeys.PROJECT" resolve="PROJECT" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2qsG4AwM11r" role="3cqZAp">
+          <node concept="3cpWsn" id="2qsG4AwM11s" role="3cpWs9">
+            <property role="TrG5h" value="mpsProject" />
+            <node concept="3uibUv" id="2qsG4AwM118" role="1tU5fm">
+              <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+            </node>
+            <node concept="2YIFZM" id="2qsG4AwM11t" role="33vP2m">
+              <ref role="37wK5l" to="alof:~ProjectHelper.fromIdeaProject(com.intellij.openapi.project.Project)" resolve="fromIdeaProject" />
+              <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
+              <node concept="37vLTw" id="2qsG4AwM11u" role="37wK5m">
+                <ref role="3cqZAo" node="2qsG4AwLZm6" resolve="project" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2qsG4AwM1JP" role="3cqZAp" />
+        <node concept="3clFbJ" id="2qsG4AwM2KB" role="3cqZAp">
+          <node concept="3clFbS" id="2qsG4AwM2KD" role="3clFbx">
+            <node concept="3cpWs8" id="2qsG4AwMg0Z" role="3cqZAp">
+              <node concept="3cpWsn" id="2qsG4AwMg10" role="3cpWs9">
+                <property role="TrG5h" value="traceEvents" />
+                <node concept="3uibUv" id="2qsG4AwMg0_" role="1tU5fm">
+                  <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+                </node>
+                <node concept="2OqwBi" id="2qsG4AwMg11" role="33vP2m">
+                  <node concept="37vLTw" id="2qsG4AwMg12" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2qsG4AwFsrf" resolve="traceObject" />
+                  </node>
+                  <node concept="liA8E" id="2qsG4AwMg13" role="2OqNvi">
+                    <ref role="37wK5l" to="1yqb:2qsG4AwM6p0" resolve="getTraceEvents" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="2qsG4AwMzDS" role="3cqZAp">
+              <node concept="3cpWsn" id="2qsG4AwMzDT" role="3cpWs9">
+                <property role="TrG5h" value="context" />
+                <node concept="3uibUv" id="2qsG4AwMzDt" role="1tU5fm">
+                  <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                </node>
+                <node concept="2OqwBi" id="2qsG4AwMzDU" role="33vP2m">
+                  <node concept="37vLTw" id="2qsG4AwMzDV" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2qsG4AwFsrf" resolve="traceObject" />
+                  </node>
+                  <node concept="liA8E" id="2qsG4AwMzDW" role="2OqNvi">
+                    <ref role="37wK5l" to="1yqb:2qsG4AwMo6X" resolve="getContext" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="2daneBOT1Ck" role="3cqZAp">
+              <node concept="3cpWsn" id="2daneBOT1Cl" role="3cpWs9">
+                <property role="TrG5h" value="activationTrace" />
+                <node concept="3uibUv" id="2daneBOT1Cm" role="1tU5fm">
+                  <ref role="3uigEE" node="7nPD14Nbbbe" resolve="TraceComponent" />
+                </node>
+                <node concept="2YIFZM" id="2daneBOT1Cn" role="33vP2m">
+                  <ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
+                  <ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
+                  <node concept="37vLTw" id="2qsG4AwM1YI" role="37wK5m">
+                    <ref role="3cqZAo" node="2qsG4AwM11s" resolve="mpsProject" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbH" id="2qsG4AwM$QJ" role="3cqZAp" />
+            <node concept="3clFbJ" id="2daneBOUCgQ" role="3cqZAp">
+              <node concept="3clFbS" id="2daneBOUCgS" role="3clFbx">
+                <node concept="3cpWs8" id="2daneBOT1Cp" role="3cqZAp">
+                  <node concept="3cpWsn" id="2daneBOT1Cq" role="3cpWs9">
+                    <property role="TrG5h" value="openedTab" />
+                    <node concept="3uibUv" id="2daneBOT1Cr" role="1tU5fm">
+                      <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+                    </node>
+                    <node concept="2OqwBi" id="2daneBOT1Cs" role="33vP2m">
+                      <node concept="37vLTw" id="2daneBOT1Ct" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2daneBOT1Cl" resolve="activationTrace" />
+                      </node>
+                      <node concept="liA8E" id="2daneBOT1Cu" role="2OqNvi">
+                        <ref role="37wK5l" node="7nPD14Nb$fz" resolve="openTab" />
+                        <node concept="2OqwBi" id="2daneBOT1Cv" role="37wK5m">
+                          <node concept="37vLTw" id="2qsG4AwMhcG" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2qsG4AwMg10" resolve="traceEvents" />
+                          </node>
+                          <node concept="liA8E" id="2daneBOTNRu" role="2OqNvi">
+                            <ref role="37wK5l" to="31yc:2daneBOTzUn" resolve="name" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="2qsG4AwMh$Q" role="37wK5m">
+                          <ref role="3cqZAo" node="2qsG4AwMg10" resolve="traceEvents" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbH" id="2ceN1hCIpLA" role="3cqZAp" />
+                <node concept="1QHqEK" id="6IQb_Rxsy5D" role="3cqZAp">
+                  <node concept="1QHqEC" id="6IQb_Rxsy5E" role="1QHqEI">
+                    <node concept="3clFbS" id="6IQb_Rxsy5F" role="1bW5cS">
+                      <node concept="3SKdUt" id="6IQb_Rxsy5M" role="3cqZAp">
+                        <node concept="1PaTwC" id="589APehYyhQ" role="3ndbpf">
+                          <node concept="3oM_SD" id="589APehYyhR" role="1PaTwD">
+                            <property role="3oM_SC" value="actually" />
+                          </node>
+                          <node concept="3oM_SD" id="589APehYyhS" role="1PaTwD">
+                            <property role="3oM_SC" value="show" />
+                          </node>
+                          <node concept="3oM_SD" id="589APehYyhT" role="1PaTwD">
+                            <property role="3oM_SC" value="the" />
+                          </node>
+                          <node concept="3oM_SD" id="589APehYyhU" role="1PaTwD">
+                            <property role="3oM_SC" value="trace" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="6IQb_Rxsy5T" role="3cqZAp">
+                        <node concept="2OqwBi" id="6IQb_Rxsy5U" role="3clFbG">
+                          <node concept="37vLTw" id="2daneBOUwlg" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2daneBOT1Cq" resolve="openedTab" />
+                          </node>
+                          <node concept="liA8E" id="6IQb_Rxsy5W" role="2OqNvi">
+                            <ref role="37wK5l" node="5X6ji59xVZa" resolve="refreshActivation" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="6IQb_Rxsy6l" role="ukAjM">
+                    <node concept="37vLTw" id="2qsG4AwMhXg" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2qsG4AwM11s" resolve="mpsProject" />
+                    </node>
+                    <node concept="liA8E" id="6IQb_Rxsy6n" role="2OqNvi">
+                      <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1Wc70l" id="2qsG4AwM_3_" role="3clFbw">
+                <node concept="3y3z36" id="2qsG4AwM_O7" role="3uHU7B">
+                  <node concept="37vLTw" id="2qsG4AwM__i" role="3uHU7B">
+                    <ref role="3cqZAo" node="2qsG4AwMg10" resolve="traceEvents" />
+                  </node>
+                  <node concept="10Nm6u" id="2qsG4AwM_YZ" role="3uHU7w" />
+                </node>
+                <node concept="3y3z36" id="2daneBOUDJ6" role="3uHU7w">
+                  <node concept="10Nm6u" id="2daneBOUEku" role="3uHU7w" />
+                  <node concept="37vLTw" id="2daneBOUCRq" role="3uHU7B">
+                    <ref role="3cqZAo" node="2daneBOT1Cl" resolve="activationTrace" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="2qsG4AwM3vr" role="3clFbw">
+            <node concept="10Nm6u" id="2qsG4AwM46G" role="3uHU7w" />
+            <node concept="37vLTw" id="2qsG4AwM36W" role="3uHU7B">
+              <ref role="3cqZAo" node="2qsG4AwFsrf" resolve="traceObject" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="1G9Y_Qv5SfN" role="1B3o_S" />
+      <node concept="3cqZAl" id="1G9Y_Qv5SfO" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="1G9Y_Qv5S7E" role="jymVt" />
+    <node concept="3Tm1VV" id="1G9Y_Qv5RZD" role="1B3o_S" />
+    <node concept="3uibUv" id="1G9Y_Qv5S7y" role="1zkMxy">
+      <ref role="3uigEE" to="7bx7:~BaseAction" resolve="BaseAction" />
+    </node>
+    <node concept="312cEg" id="2qsG4AwFsrf" role="jymVt">
+      <property role="TrG5h" value="traceObject" />
+      <node concept="3Tm6S6" id="2qsG4AwFsrg" role="1B3o_S" />
+      <node concept="3uibUv" id="2qsG4AwFt7K" role="1tU5fm">
+        <ref role="3uigEE" to="1yqb:1G9Y_Qvb1CP" resolve="TraceObject" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index c91b0285..e237c8e4 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -32,6 +32,7 @@
     <import index="fqlx" ref="r:2cc226a9-8a78-4010-b962-823343fd28ff(jetbrains.mps.lang.coderules.aspect)" />
     <import index="d6hs" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.errors.item(MPS.Core/)" />
     <import index="9x2e" ref="r:0730b0d1-7e2f-4982-aac3-8069c5060a9c(jetbrains.mps.lang.typesystem2.reporting)" />
+    <import index="31yc" ref="r:0c18ff61-1cb9-4ff0-a899-c949ad03f97c(jetbrains.mps.coderules.plugin)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -6134,5 +6135,108 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="1G9Y_Qvb1CP">
+    <property role="TrG5h" value="TraceObject" />
+    <node concept="2tJIrI" id="1G9Y_Qvb2MW" role="jymVt" />
+    <node concept="3clFb_" id="1G9Y_Qvb2Ov" role="jymVt">
+      <property role="TrG5h" value="addTraceEvents" />
+      <node concept="37vLTG" id="1G9Y_Qvb2PR" role="3clF46">
+        <property role="TrG5h" value="traceEvents" />
+        <node concept="3uibUv" id="1G9Y_Qvb2VQ" role="1tU5fm">
+          <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="1G9Y_Qvb2Ox" role="3clF45" />
+      <node concept="3Tm1VV" id="1G9Y_Qvb2Oy" role="1B3o_S" />
+      <node concept="3clFbS" id="1G9Y_Qvb2Oz" role="3clF47">
+        <node concept="3clFbF" id="1G9Y_Qvb3Xk" role="3cqZAp">
+          <node concept="37vLTI" id="1G9Y_Qvb3Xm" role="3clFbG">
+            <node concept="2OqwBi" id="1G9Y_Qvb4On" role="37vLTJ">
+              <node concept="Xjq3P" id="1G9Y_Qvb4SA" role="2Oq$k0" />
+              <node concept="2OwXpG" id="1G9Y_Qvb4Oq" role="2OqNvi">
+                <ref role="2Oxat5" node="1G9Y_Qvb3Xg" resolve="traceEvents" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="1G9Y_Qvb3Xq" role="37vLTx">
+              <ref role="3cqZAo" node="1G9Y_Qvb2PR" resolve="traceEvents" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwM50i" role="jymVt" />
+    <node concept="3clFb_" id="2qsG4AwM6p0" role="jymVt">
+      <property role="TrG5h" value="getTraceEvents" />
+      <node concept="3uibUv" id="2qsG4AwM6tL" role="3clF45">
+        <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+      </node>
+      <node concept="3Tm1VV" id="2qsG4AwM6p3" role="1B3o_S" />
+      <node concept="3clFbS" id="2qsG4AwM6p4" role="3clF47">
+        <node concept="3clFbF" id="2qsG4AwM6Gf" role="3cqZAp">
+          <node concept="37vLTw" id="2qsG4AwM6Ge" role="3clFbG">
+            <ref role="3cqZAo" node="1G9Y_Qvb3Xg" resolve="traceEvents" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="1G9Y_Qvb2N5" role="jymVt" />
+    <node concept="3clFb_" id="2qsG4AwMiaX" role="jymVt">
+      <property role="TrG5h" value="setContext" />
+      <node concept="37vLTG" id="2qsG4AwMik3" role="3clF46">
+        <property role="TrG5h" value="context" />
+        <node concept="3uibUv" id="2qsG4AwMmuu" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="2qsG4AwMiaZ" role="3clF45" />
+      <node concept="3Tm1VV" id="2qsG4AwMib0" role="1B3o_S" />
+      <node concept="3clFbS" id="2qsG4AwMib1" role="3clF47">
+        <node concept="3clFbF" id="2qsG4AwMnaI" role="3cqZAp">
+          <node concept="37vLTI" id="2qsG4AwMnaK" role="3clFbG">
+            <node concept="2OqwBi" id="2qsG4AwMnXH" role="37vLTJ">
+              <node concept="Xjq3P" id="2qsG4AwMo1B" role="2Oq$k0" />
+              <node concept="2OwXpG" id="2qsG4AwMnXK" role="2OqNvi">
+                <ref role="2Oxat5" node="2qsG4AwMnaE" resolve="context" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="2qsG4AwMnaO" role="37vLTx">
+              <ref role="3cqZAo" node="2qsG4AwMik3" resolve="context" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwMi8x" role="jymVt" />
+    <node concept="3clFb_" id="2qsG4AwMo6X" role="jymVt">
+      <property role="TrG5h" value="getContext" />
+      <node concept="3uibUv" id="2qsG4AwMoc7" role="3clF45">
+        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+      </node>
+      <node concept="3Tm1VV" id="2qsG4AwMo70" role="1B3o_S" />
+      <node concept="3clFbS" id="2qsG4AwMo71" role="3clF47">
+        <node concept="3clFbF" id="2qsG4AwMp5I" role="3cqZAp">
+          <node concept="37vLTw" id="2qsG4AwMp5H" role="3clFbG">
+            <ref role="3cqZAo" node="2qsG4AwMnaE" resolve="context" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2qsG4AwMo3b" role="jymVt" />
+    <node concept="3Tm1VV" id="1G9Y_Qvb1CQ" role="1B3o_S" />
+    <node concept="312cEg" id="1G9Y_Qvb3Xg" role="jymVt">
+      <property role="TrG5h" value="traceEvents" />
+      <node concept="3Tm6S6" id="1G9Y_Qvb3Xh" role="1B3o_S" />
+      <node concept="3uibUv" id="1G9Y_Qvb3Xj" role="1tU5fm">
+        <ref role="3uigEE" to="31yc:2ceN1hCYUQN" resolve="TraceEventsCollector" />
+      </node>
+    </node>
+    <node concept="312cEg" id="2qsG4AwMnaE" role="jymVt">
+      <property role="TrG5h" value="context" />
+      <node concept="3Tm6S6" id="2qsG4AwMnaF" role="1B3o_S" />
+      <node concept="3uibUv" id="2qsG4AwMnaH" role="1tU5fm">
+        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index a7540d77..f31074d9 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -1733,19 +1733,6 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbF" id="2daneBOVtpv" role="3cqZAp">
-                              <node concept="2OqwBi" id="2daneBOVtpw" role="3clFbG">
-                                <node concept="37vLTw" id="2daneBOUuMI" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2daneBOT1Cq" resolve="openedTab" />
-                                </node>
-                                <node concept="liA8E" id="2daneBOVtpx" role="2OqNvi">
-                                  <ref role="37wK5l" to="o35r:6_UQWSXcgLF" resolve="setContextEditorComponent" />
-                                  <node concept="37vLTw" id="2daneBOVtpy" role="37wK5m">
-                                    <ref role="3cqZAo" node="6IQb_Rxsgb3" resolve="editorComponent" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
                             <node concept="3clFbF" id="2daneBOVtpz" role="3cqZAp">
                               <node concept="2OqwBi" id="2daneBOVtp$" role="3clFbG">
                                 <node concept="37vLTw" id="2daneBOUwlg" role="2Oq$k0">