diff --git a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
index 552eafb6..2f3808b7 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking.ui/models/ui.plugin.mps
@@ -491,7 +491,6 @@
         <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
       </concept>
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
-      <concept id="8974276187400348183" name="jetbrains.mps.lang.access.structure.ExecuteWriteActionStatement" flags="nn" index="1QHqEM" />
       <concept id="8974276187400348179" name="jetbrains.mps.lang.access.structure.ExecuteEDTCommandStatement" flags="nn" index="1QHqEQ" />
     </language>
     <language id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots">
@@ -554,9 +553,6 @@
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
-      <concept id="1206482823744" name="jetbrains.mps.lang.smodel.structure.Model_AddRootOperation" flags="nn" index="3BYIHo">
-        <child id="1206482823746" name="nodeArgument" index="3BYIHq" />
-      </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
@@ -641,7 +637,6 @@
         <child id="1225711191269" name="index" index="1y58nS" />
       </concept>
       <concept id="1208542034276" name="jetbrains.mps.baseLanguage.collections.structure.MapClearOperation" flags="nn" index="1yHZxX" />
-      <concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="1184963466173" name="jetbrains.mps.baseLanguage.collections.structure.ToArrayOperation" flags="nn" index="3_kTaI" />
@@ -816,6 +811,25 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="6IQb_RxDYpj" role="3cqZAp">
+          <node concept="3cpWsn" id="6IQb_RxDYpk" role="3cpWs9">
+            <property role="TrG5h" value="collectTypesStep" />
+            <node concept="3uibUv" id="6IQb_RxDYpf" role="1tU5fm">
+              <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
+            </node>
+            <node concept="2ShNRf" id="6IQb_RxDYpl" role="33vP2m">
+              <node concept="1pGfFk" id="6IQb_RxDYpm" role="2ShVmc">
+                <ref role="37wK5l" to="tj24:6IQb_RxlCdT" resolve="CollectTypesStep" />
+                <node concept="2OqwBi" id="6IQb_RxDYpn" role="37wK5m">
+                  <node concept="2WthIp" id="6IQb_RxDYpo" role="2Oq$k0" />
+                  <node concept="1DTwFV" id="6IQb_RxDYpp" role="2OqNvi">
+                    <ref role="2WH_rO" node="7iCFfvQBVbg" resolve="mpsProject" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="6kREIVkWwzm" role="3cqZAp">
           <node concept="3cpWsn" id="6kREIVkWwzn" role="3cpWs9">
             <property role="TrG5h" value="highlightingStep" />
@@ -961,6 +975,9 @@
                 <node concept="37vLTw" id="6kREIVkY12_" role="37wK5m">
                   <ref role="3cqZAo" node="6kREIVkWuSD" resolve="evaluateRulesStep" />
                 </node>
+                <node concept="37vLTw" id="6IQb_RxE0cM" role="37wK5m">
+                  <ref role="3cqZAo" node="6IQb_RxDYpk" resolve="collectTypesStep" />
+                </node>
                 <node concept="37vLTw" id="6kREIVkY12A" role="37wK5m">
                   <ref role="3cqZAo" node="6kREIVkWwzn" resolve="highlightingStep" />
                 </node>
@@ -1359,8 +1376,8 @@
       <node concept="37vLTG" id="3mz2_dYC7$W" role="3clF46">
         <property role="TrG5h" value="traceTabs" />
         <node concept="_YKpA" id="5cnt3vhcV9D" role="1tU5fm">
-          <node concept="3uibUv" id="5cnt3vhcV9E" role="_ZDj9">
-            <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+          <node concept="3uibUv" id="6IQb_RxSQFn" role="_ZDj9">
+            <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
           </node>
         </node>
       </node>
@@ -1590,8 +1607,8 @@
                                       <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
                                     </node>
                                     <node concept="_YKpA" id="5cnt3vhcXDL" role="1Lm7xW">
-                                      <node concept="3uibUv" id="5cnt3vhcXDM" role="_ZDj9">
-                                        <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+                                      <node concept="3uibUv" id="6IQb_RxRs4d" role="_ZDj9">
+                                        <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
                                       </node>
                                     </node>
                                   </node>
@@ -1652,7 +1669,7 @@
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="3mz2_dYCXij" role="2OqNvi">
-                                            <ref role="37wK5l" node="3mz2_dYCBxr" resolve="closeTab" />
+                                            <ref role="37wK5l" node="6IQb_Rxo4au" resolve="closeTab" />
                                             <node concept="37vLTw" id="5cnt3vhd69F" role="37wK5m">
                                               <ref role="3cqZAo" node="5cnt3vhd4Ct" resolve="tt" />
                                             </node>
@@ -1662,8 +1679,8 @@
                                     </node>
                                     <node concept="3cpWsn" id="5cnt3vhd4Ct" role="1Duv9x">
                                       <property role="TrG5h" value="tt" />
-                                      <node concept="3uibUv" id="5cnt3vhd4Cx" role="1tU5fm">
-                                        <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+                                      <node concept="3uibUv" id="6IQb_RxRx6U" role="1tU5fm">
+                                        <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
                                       </node>
                                     </node>
                                     <node concept="1LFfDK" id="5cnt3vhd4Cy" role="1DdaDG">
@@ -2063,8 +2080,8 @@
       <node concept="37vLTG" id="3mz2_dYC9td" role="3clF46">
         <property role="TrG5h" value="traceTabs" />
         <node concept="_YKpA" id="5cnt3vhcWHw" role="1tU5fm">
-          <node concept="3uibUv" id="5cnt3vhcWHx" role="_ZDj9">
-            <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+          <node concept="3uibUv" id="6IQb_RxRuBC" role="_ZDj9">
+            <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
           </node>
         </node>
       </node>
@@ -2099,8 +2116,8 @@
                 <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
               </node>
               <node concept="_YKpA" id="5cnt3vhd6A8" role="1Lm7xW">
-                <node concept="3uibUv" id="5cnt3vhd6A9" role="_ZDj9">
-                  <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+                <node concept="3uibUv" id="6IQb_RxRh2Y" role="_ZDj9">
+                  <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
                 </node>
               </node>
             </node>
@@ -2184,7 +2201,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="5cnt3vhdhiP" role="2OqNvi">
-                      <ref role="37wK5l" node="3mz2_dYCBxr" resolve="closeTab" />
+                      <ref role="37wK5l" node="6IQb_Rxo4au" resolve="closeTab" />
                       <node concept="37vLTw" id="5cnt3vhdhiQ" role="37wK5m">
                         <ref role="3cqZAo" node="5cnt3vhdhiR" resolve="tt" />
                       </node>
@@ -2194,8 +2211,8 @@
               </node>
               <node concept="3cpWsn" id="5cnt3vhdhiR" role="1Duv9x">
                 <property role="TrG5h" value="tt" />
-                <node concept="3uibUv" id="5cnt3vhdhiS" role="1tU5fm">
-                  <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+                <node concept="3uibUv" id="6IQb_RxRgx0" role="1tU5fm">
+                  <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
                 </node>
               </node>
               <node concept="1LFfDK" id="5cnt3vhdhiT" role="1DdaDG">
@@ -2286,7 +2303,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="5cnt3vhdilX" role="2OqNvi">
-                      <ref role="37wK5l" node="3mz2_dYCBxr" resolve="closeTab" />
+                      <ref role="37wK5l" node="6IQb_Rxo4au" resolve="closeTab" />
                       <node concept="37vLTw" id="5cnt3vhdilY" role="37wK5m">
                         <ref role="3cqZAo" node="5cnt3vhdilZ" resolve="tt" />
                       </node>
@@ -2296,8 +2313,8 @@
               </node>
               <node concept="3cpWsn" id="5cnt3vhdilZ" role="1Duv9x">
                 <property role="TrG5h" value="tt" />
-                <node concept="3uibUv" id="5cnt3vhdim0" role="1tU5fm">
-                  <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+                <node concept="3uibUv" id="6IQb_RxReLS" role="1tU5fm">
+                  <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
                 </node>
               </node>
               <node concept="1LFfDK" id="5cnt3vhdim1" role="1DdaDG">
@@ -2317,8 +2334,8 @@
                 <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
               </node>
               <node concept="_YKpA" id="5cnt3vhdgzW" role="1Lm7xW">
-                <node concept="3uibUv" id="5cnt3vhdgzX" role="_ZDj9">
-                  <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+                <node concept="3uibUv" id="6IQb_RxRfoe" role="_ZDj9">
+                  <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
                 </node>
               </node>
             </node>
@@ -2347,8 +2364,8 @@
             <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
           </node>
           <node concept="_YKpA" id="5cnt3vhcYi1" role="1Lm7xW">
-            <node concept="3uibUv" id="5cnt3vhcYi2" role="_ZDj9">
-              <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+            <node concept="3uibUv" id="6IQb_RxR60y" role="_ZDj9">
+              <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
             </node>
           </node>
         </node>
@@ -2360,8 +2377,8 @@
               <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
             </node>
             <node concept="_YKpA" id="5cnt3vhd0nv" role="1Lm7xW">
-              <node concept="3uibUv" id="5cnt3vhd0nw" role="_ZDj9">
-                <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+              <node concept="3uibUv" id="6IQb_RxRafU" role="_ZDj9">
+                <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
               </node>
             </node>
           </node>
@@ -2805,6 +2822,42 @@
       </node>
     </node>
     <node concept="2tJIrI" id="3mz2_dYCzFl" role="jymVt" />
+    <node concept="3clFb_" id="6IQb_Rxo4au" role="jymVt">
+      <property role="TrG5h" value="closeTab" />
+      <node concept="37vLTG" id="6IQb_Rxo4av" role="3clF46">
+        <property role="TrG5h" value="tabComponent" />
+        <node concept="3uibUv" id="6IQb_Rxo4HF" role="1tU5fm">
+          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="6IQb_Rxo4ax" role="3clF45" />
+      <node concept="3Tm1VV" id="6IQb_Rxo4ay" role="1B3o_S" />
+      <node concept="3clFbS" id="6IQb_Rxo4az" role="3clF47">
+        <node concept="3clFbJ" id="6IQb_Rxo4a$" role="3cqZAp">
+          <node concept="3clFbS" id="6IQb_Rxo4a_" role="3clFbx">
+            <node concept="3clFbF" id="6IQb_Rxo4aA" role="3cqZAp">
+              <node concept="2OqwBi" id="6IQb_Rxo4aB" role="3clFbG">
+                <node concept="37vLTw" id="6IQb_Rxo4aC" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7nPD14Nbx0U" resolve="tool" />
+                </node>
+                <node concept="3ryLUP" id="6IQb_Rxo4aD" role="2OqNvi">
+                  <node concept="37vLTw" id="6IQb_Rxo4aF" role="3ryLir">
+                    <ref role="3cqZAo" node="6IQb_Rxo4av" resolve="tabComponent" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="6IQb_Rxo4aM" role="3clFbw">
+            <node concept="37vLTw" id="6IQb_Rxo4aN" role="3uHU7B">
+              <ref role="3cqZAo" node="6IQb_Rxo4av" resolve="tabComponent" />
+            </node>
+            <node concept="10Nm6u" id="6IQb_Rxo4aO" role="3uHU7w" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_Rxo4at" role="jymVt" />
     <node concept="3clFb_" id="Nob1E3CTMt" role="jymVt">
       <property role="TrG5h" value="showTool" />
       <node concept="3cqZAl" id="Nob1E3CTMv" role="3clF45" />
@@ -15611,6 +15664,7 @@
     <property role="2bfB8j" value="false" />
     <property role="TrG5h" value="TraceTab" />
     <property role="3GE5qa" value="trace" />
+    <node concept="2tJIrI" id="6IQb_RxmY7e" role="jymVt" />
     <node concept="3clFbW" id="5X6ji59z8UV" role="jymVt">
       <node concept="37vLTG" id="5X6ji59zkk1" role="3clF46">
         <property role="TrG5h" value="mpsProject" />
@@ -19087,25 +19141,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="6QkkSolbx5N" role="jymVt" />
-    <node concept="312cEg" id="Nob1E3_Y0v" role="jymVt">
-      <property role="TrG5h" value="filteredActivationEvents" />
-      <node concept="3Tm6S6" id="Nob1E3_Y0w" role="1B3o_S" />
-      <node concept="2hMVRd" id="6_UQWSXeZyI" role="1tU5fm">
-        <node concept="3uibUv" id="6_UQWSXeZyK" role="2hN53Y">
-          <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="Nob1E3A0zo" role="33vP2m">
-        <node concept="2i4dXS" id="6_UQWSXf6CL" role="2ShVmc">
-          <node concept="3uibUv" id="6_UQWSXf6CN" role="HW$YZ">
-            <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
-          </node>
-          <node concept="37vLTw" id="6_UQWSXf6CO" role="I$8f6">
-            <ref role="3cqZAo" node="6_UQWSXeH9C" resolve="DEFAULT_FILTERED_ACTIVATION" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="YGS68MO9ok" role="jymVt" />
     <node concept="Wx3nA" id="YGS68MOj5Z" role="jymVt">
       <property role="TrG5h" value="DEFAULT_FILTERED_STORE" />
@@ -19273,6 +19308,25 @@
     </node>
     <node concept="3Tm1VV" id="5X6ji59z5Fb" role="1B3o_S" />
     <node concept="2tJIrI" id="YGS68MKel8" role="jymVt" />
+    <node concept="312cEg" id="Nob1E3_Y0v" role="jymVt">
+      <property role="TrG5h" value="filteredActivationEvents" />
+      <node concept="3Tm6S6" id="Nob1E3_Y0w" role="1B3o_S" />
+      <node concept="2hMVRd" id="6_UQWSXeZyI" role="1tU5fm">
+        <node concept="3uibUv" id="6_UQWSXeZyK" role="2hN53Y">
+          <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="Nob1E3A0zo" role="33vP2m">
+        <node concept="2i4dXS" id="6_UQWSXf6CL" role="2ShVmc">
+          <node concept="3uibUv" id="6_UQWSXf6CN" role="HW$YZ">
+            <ref role="3uigEE" node="5X6ji59xezw" resolve="ActivationEvent" />
+          </node>
+          <node concept="37vLTw" id="6_UQWSXf6CO" role="I$8f6">
+            <ref role="3cqZAo" node="6_UQWSXeH9C" resolve="DEFAULT_FILTERED_ACTIVATION" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="312cEg" id="YGS68MNSZT" role="jymVt">
       <property role="34CwA1" value="false" />
       <property role="eg7rD" value="false" />
@@ -19284,7 +19338,6 @@
         <property role="3cmrfH" value="0" />
       </node>
     </node>
-    <node concept="2tJIrI" id="YGS68MNVFD" role="jymVt" />
     <node concept="312cEg" id="YGS68MKD$W" role="jymVt">
       <property role="TrG5h" value="activationColumns" />
       <node concept="3Tm6S6" id="YGS68MKD$U" role="1B3o_S" />
@@ -19292,7 +19345,6 @@
         <ref role="3uigEE" node="4VwaB4LGdOL" resolve="ActivationColumns" />
       </node>
     </node>
-    <node concept="2tJIrI" id="Nob1E3_Sfc" role="jymVt" />
     <node concept="312cEg" id="YGS68MLaS8" role="jymVt">
       <property role="TrG5h" value="storeColumns" />
       <node concept="3Tm6S6" id="YGS68MLaS6" role="1B3o_S" />
@@ -19300,7 +19352,6 @@
         <ref role="3uigEE" node="6QkkSolfqrm" resolve="StoreColumns" />
       </node>
     </node>
-    <node concept="2tJIrI" id="YGS68MELVN" role="jymVt" />
     <node concept="312cEg" id="Nob1E3$O98" role="jymVt">
       <property role="TrG5h" value="activationTreeTable" />
       <node concept="3Tm6S6" id="Nob1E3$O96" role="1B3o_S" />
@@ -19308,7 +19359,6 @@
         <ref role="3uigEE" node="5pDu2jaI1pA" resolve="ActionableTreeTable" />
       </node>
     </node>
-    <node concept="2tJIrI" id="YGS68MK9HJ" role="jymVt" />
     <node concept="312cEg" id="6QkkSolbdUA" role="jymVt">
       <property role="TrG5h" value="storeTreeTable" />
       <node concept="3Tm6S6" id="6QkkSolbdUB" role="1B3o_S" />
@@ -19316,7 +19366,6 @@
         <ref role="3uigEE" node="5pDu2jaI1pA" resolve="ActionableTreeTable" />
       </node>
     </node>
-    <node concept="2tJIrI" id="YGS68MKc0e" role="jymVt" />
     <node concept="312cEg" id="5X6ji59z9v8" role="jymVt">
       <property role="TrG5h" value="tabPanel" />
       <node concept="3Tm6S6" id="5X6ji59z9v9" role="1B3o_S" />
@@ -23311,6 +23360,9 @@
             <node concept="2ShNRf" id="6kREIVkW$Kw" role="33vP2m">
               <node concept="1pGfFk" id="6kREIVkW$Kx" role="2ShVmc">
                 <ref role="37wK5l" node="55Q$YFtIVZ9" resolve="EvaluateRulesWithTraceStep" />
+                <node concept="37vLTw" id="6IQb_RxslNj" role="37wK5m">
+                  <ref role="3cqZAo" node="6kREIVkUWtj" resolve="editorComponent" />
+                </node>
                 <node concept="2OqwBi" id="6kREIVkW$Kz" role="37wK5m">
                   <node concept="2WthIp" id="6kREIVkW$K$" role="2Oq$k0" />
                   <node concept="1DTwFV" id="6kREIVkW$K_" role="2OqNvi">
@@ -23321,6 +23373,25 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="6IQb_RxE4OX" role="3cqZAp">
+          <node concept="3cpWsn" id="6IQb_RxE4OY" role="3cpWs9">
+            <property role="TrG5h" value="collectTypesStep" />
+            <node concept="3uibUv" id="6IQb_RxE4OT" role="1tU5fm">
+              <ref role="3uigEE" node="6IQb_RxxWnM" resolve="CollectTypesWithTraceStep" />
+            </node>
+            <node concept="2ShNRf" id="6IQb_RxE4OZ" role="33vP2m">
+              <node concept="1pGfFk" id="6IQb_RxE4P0" role="2ShVmc">
+                <ref role="37wK5l" node="6IQb_RxxY2V" resolve="CollectTypesWithTraceStep" />
+                <node concept="2OqwBi" id="6IQb_RxE4P1" role="37wK5m">
+                  <node concept="2WthIp" id="6IQb_RxE4P2" role="2Oq$k0" />
+                  <node concept="1DTwFV" id="6IQb_RxE4P3" role="2OqNvi">
+                    <ref role="2WH_rO" node="7f1nCjLFvfT" resolve="mpsProject" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="6kREIVkWArs" role="3cqZAp">
           <node concept="3cpWsn" id="6kREIVkWArt" role="3cpWs9">
             <property role="TrG5h" value="highlightingStep" />
@@ -23466,6 +23537,9 @@
                 <node concept="37vLTw" id="6kREIVkYJTF" role="37wK5m">
                   <ref role="3cqZAo" node="6kREIVkW$Kv" resolve="evaluateRulesStep" />
                 </node>
+                <node concept="37vLTw" id="6IQb_RxE6EU" role="37wK5m">
+                  <ref role="3cqZAo" node="6IQb_RxE4OY" resolve="collectTypesStep" />
+                </node>
                 <node concept="37vLTw" id="6kREIVkYJTG" role="37wK5m">
                   <ref role="3cqZAo" node="6kREIVkWArt" resolve="highlightingStep" />
                 </node>
@@ -27163,8 +27237,8 @@
         <property role="TrG5h" value="prevStep" />
         <node concept="3uibUv" id="Hg6EncbkRT" role="1tU5fm">
           <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
-          <node concept="3uibUv" id="Hg6EncbkS0" role="11_B2D">
-            <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+          <node concept="3uibUv" id="6IQb_RxDyVo" role="11_B2D">
+            <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
           </node>
         </node>
       </node>
@@ -27192,437 +27266,63 @@
               <node concept="1bVj0M" id="Hg6EncbqUM" role="37wK5m">
                 <node concept="37vLTG" id="Hg6EncbrFm" role="1bW2Oz">
                   <property role="TrG5h" value="prev" />
-                  <node concept="3uibUv" id="Hg6Encbstd" role="1tU5fm">
-                    <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+                  <node concept="3uibUv" id="6IQb_RxDjeB" role="1tU5fm">
+                    <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
                   </node>
                 </node>
                 <node concept="3clFbS" id="Hg6EncbqUN" role="1bW5cS">
                   <node concept="3clFbH" id="6kREIVkm2dh" role="3cqZAp" />
-                  <node concept="3clFbJ" id="Hg6EncbtT8" role="3cqZAp">
-                    <node concept="3clFbS" id="Hg6EncbtT9" role="3clFbx">
-                      <node concept="3cpWs8" id="Hg6EncbtTa" role="3cqZAp">
-                        <node concept="3cpWsn" id="Hg6EncbtTb" role="3cpWs9">
-                          <property role="TrG5h" value="modelOwner" />
-                          <node concept="3uibUv" id="Hg6EncbtTc" role="1tU5fm">
-                            <ref role="3uigEE" to="umch:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
-                          </node>
-                          <node concept="2OqwBi" id="Hg6EncbtTd" role="33vP2m">
-                            <node concept="2YIFZM" id="Hg6EncbtTe" role="2Oq$k0">
-                              <ref role="37wK5l" to="umch:2zU3cYqxb_u" resolve="get" />
-                              <ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
-                              <node concept="2OqwBi" id="Hg6EncbtTf" role="37wK5m">
-                                <node concept="37vLTw" id="6kREIVkO3rx" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="6kREIVkNFsd" resolve="mpsProject" />
-                                </node>
-                                <node concept="liA8E" id="Hg6EncbtTj" role="2OqNvi">
-                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="liA8E" id="Hg6EncbtTk" role="2OqNvi">
-                              <ref role="37wK5l" to="umch:2zU3cYq$52j" resolve="emptyModel" />
-                            </node>
-                          </node>
+                  <node concept="3clFbF" id="Hg6EncbtUJ" role="3cqZAp">
+                    <node concept="2YIFZM" id="Hg6EncbtUK" role="3clFbG">
+                      <ref role="1Pybhc" node="41ox5VnpFrR" resolve="MarkPlugin" />
+                      <ref role="37wK5l" node="41ox5VnqukP" resolve="markTypesAndErrors" />
+                      <node concept="37vLTw" id="6kREIVkNRWj" role="37wK5m">
+                        <ref role="3cqZAo" node="6kREIVkNFsd" resolve="mpsProject" />
+                      </node>
+                      <node concept="2OqwBi" id="Hg6EncbtUO" role="37wK5m">
+                        <node concept="Xjq3P" id="Hg6EncbtUP" role="2Oq$k0" />
+                        <node concept="2OwXpG" id="Hg6EncbtUQ" role="2OqNvi">
+                          <ref role="2Oxat5" node="1pPth$lGU8f" resolve="editorComponent" />
                         </node>
                       </node>
-                      <node concept="3cpWs8" id="Hg6EncbtTl" role="3cqZAp">
-                        <node concept="3cpWsn" id="Hg6EncbtTm" role="3cpWs9">
-                          <property role="TrG5h" value="typeModel" />
-                          <node concept="H_c77" id="Hg6EncbtTn" role="1tU5fm" />
-                          <node concept="2OqwBi" id="Hg6EncbtTo" role="33vP2m">
-                            <node concept="37vLTw" id="Hg6EncbtTp" role="2Oq$k0">
-                              <ref role="3cqZAo" node="Hg6EncbtTb" resolve="modelOwner" />
-                            </node>
-                            <node concept="liA8E" id="Hg6EncbtTq" role="2OqNvi">
-                              <ref role="37wK5l" to="umch:2zU3cYq$9HD" resolve="model" />
-                            </node>
+                      <node concept="2OqwBi" id="Hg6EncbtUR" role="37wK5m">
+                        <node concept="2OqwBi" id="Hg6EncbtUS" role="2Oq$k0">
+                          <node concept="Xjq3P" id="Hg6EncbtUT" role="2Oq$k0" />
+                          <node concept="2OwXpG" id="Hg6EncbtUU" role="2OqNvi">
+                            <ref role="2Oxat5" node="1pPth$lGU8f" resolve="editorComponent" />
                           </node>
                         </node>
+                        <node concept="liA8E" id="Hg6EncbtUV" role="2OqNvi">
+                          <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
+                        </node>
                       </node>
-                      <node concept="3clFbH" id="Hg6EncbtTr" role="3cqZAp" />
-                      <node concept="1QHqEK" id="Hg6EncbtTs" role="3cqZAp">
-                        <node concept="1QHqEC" id="Hg6EncbtTt" role="1QHqEI">
-                          <node concept="3clFbS" id="Hg6EncbtTu" role="1bW5cS">
-                            <node concept="3cpWs8" id="Hg6EncbtTv" role="3cqZAp">
-                              <node concept="3cpWsn" id="Hg6EncbtTw" role="3cpWs9">
-                                <property role="TrG5h" value="typesCollector" />
-                                <node concept="3uibUv" id="Hg6EncbtTx" role="1tU5fm">
-                                  <ref role="3uigEE" to="tj24:6HT7BWBSFOV" resolve="TypeCollector" />
-                                </node>
-                                <node concept="2ShNRf" id="Hg6EncbtTy" role="33vP2m">
-                                  <node concept="1pGfFk" id="Hg6EncbtTz" role="2ShVmc">
-                                    <ref role="37wK5l" to="tj24:1CcQBrQmOiH" resolve="TypeCollector" />
-                                    <node concept="2OqwBi" id="Hg6EncbtT$" role="37wK5m">
-                                      <node concept="37vLTw" id="Hg6EncbtT_" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
-                                      </node>
-                                      <node concept="liA8E" id="6kREIVl1ilt" role="2OqNvi">
-                                        <ref role="37wK5l" to="tj24:6kREIVl0T6d" resolve="getStoreView" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="1DcWWT" id="Hg6EncbtTB" role="3cqZAp">
-                              <node concept="3clFbS" id="Hg6EncbtTC" role="2LFqv$">
-                                <node concept="3cpWs8" id="Hg6EncbtTD" role="3cqZAp">
-                                  <node concept="3cpWsn" id="Hg6EncbtTE" role="3cpWs9">
-                                    <property role="TrG5h" value="typeNode" />
-                                    <node concept="3Tqbb2" id="Hg6EncbtTF" role="1tU5fm" />
-                                    <node concept="2OqwBi" id="Hg6EncbtTG" role="33vP2m">
-                                      <node concept="37vLTw" id="Hg6EncbtTH" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="Hg6EncbtTw" resolve="typesCollector" />
-                                      </node>
-                                      <node concept="liA8E" id="Hg6EncbtTI" role="2OqNvi">
-                                        <ref role="37wK5l" to="tj24:1CcQBrQmO_H" resolve="typeNode" />
-                                        <node concept="37vLTw" id="Hg6EncbtTJ" role="37wK5m">
-                                          <ref role="3cqZAo" node="Hg6EncbtTY" resolve="ref" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3clFbJ" id="Hg6EncbtTK" role="3cqZAp">
-                                  <node concept="3clFbS" id="Hg6EncbtTL" role="3clFbx">
-                                    <node concept="3clFbF" id="Hg6EncbtTM" role="3cqZAp">
-                                      <node concept="37vLTI" id="Hg6EncbtTN" role="3clFbG">
-                                        <node concept="3EllGN" id="Hg6EncbtTO" role="37vLTJ">
-                                          <node concept="37vLTw" id="Hg6EncbtTP" role="3ElVtu">
-                                            <ref role="3cqZAo" node="Hg6EncbtTY" resolve="ref" />
-                                          </node>
-                                          <node concept="37vLTw" id="Hg6EncbtTQ" role="3ElQJh">
-                                            <ref role="3cqZAo" node="52a_GfIIGna" resolve="typeNodes" />
-                                          </node>
-                                        </node>
-                                        <node concept="2OqwBi" id="Hg6EncbtTR" role="37vLTx">
-                                          <node concept="37vLTw" id="Hg6EncbtTS" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="Hg6EncbtTm" resolve="typeModel" />
-                                          </node>
-                                          <node concept="3BYIHo" id="Hg6EncbtTT" role="2OqNvi">
-                                            <node concept="37vLTw" id="Hg6EncbtTU" role="3BYIHq">
-                                              <ref role="3cqZAo" node="Hg6EncbtTE" resolve="typeNode" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3y3z36" id="Hg6EncbtTV" role="3clFbw">
-                                    <node concept="10Nm6u" id="Hg6EncbtTW" role="3uHU7w" />
-                                    <node concept="37vLTw" id="Hg6EncbtTX" role="3uHU7B">
-                                      <ref role="3cqZAo" node="Hg6EncbtTE" resolve="typeNode" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3cpWsn" id="Hg6EncbtTY" role="1Duv9x">
-                                <property role="TrG5h" value="ref" />
-                                <node concept="3uibUv" id="Hg6EncbtTZ" role="1tU5fm">
-                                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="Hg6EncbtU0" role="1DdaDG">
-                                <node concept="37vLTw" id="Hg6EncbtU1" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="Hg6EncbtTw" resolve="typesCollector" />
-                                </node>
-                                <node concept="liA8E" id="Hg6EncbtU2" role="2OqNvi">
-                                  <ref role="37wK5l" to="tj24:1CcQBrQnllM" resolve="typedNodeReferences" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="1DcWWT" id="Hg6EncbtU3" role="3cqZAp">
-                              <node concept="3clFbS" id="Hg6EncbtU4" role="2LFqv$">
-                                <node concept="3cpWs8" id="Hg6EncbtU5" role="3cqZAp">
-                                  <node concept="3cpWsn" id="Hg6EncbtU6" role="3cpWs9">
-                                    <property role="TrG5h" value="error" />
-                                    <node concept="17QB3L" id="Hg6EncbtU7" role="1tU5fm" />
-                                    <node concept="2OqwBi" id="Hg6EncbtU8" role="33vP2m">
-                                      <node concept="37vLTw" id="Hg6EncbtU9" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="Hg6EncbtTw" resolve="typesCollector" />
-                                      </node>
-                                      <node concept="liA8E" id="Hg6EncbtUa" role="2OqNvi">
-                                        <ref role="37wK5l" to="tj24:5tpkEj3JHbg" resolve="error" />
-                                        <node concept="37vLTw" id="Hg6EncbtUb" role="37wK5m">
-                                          <ref role="3cqZAo" node="Hg6EncbtUn" resolve="ref" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3clFbJ" id="Hg6EncbtUc" role="3cqZAp">
-                                  <node concept="3clFbS" id="Hg6EncbtUd" role="3clFbx">
-                                    <node concept="3clFbF" id="Hg6EncbtUe" role="3cqZAp">
-                                      <node concept="37vLTI" id="Hg6EncbtUf" role="3clFbG">
-                                        <node concept="3EllGN" id="Hg6EncbtUg" role="37vLTJ">
-                                          <node concept="37vLTw" id="Hg6EncbtUh" role="3ElVtu">
-                                            <ref role="3cqZAo" node="Hg6EncbtUn" resolve="ref" />
-                                          </node>
-                                          <node concept="37vLTw" id="Hg6EncbtUi" role="3ElQJh">
-                                            <ref role="3cqZAo" node="5tpkEj3KeIf" resolve="errors" />
-                                          </node>
-                                        </node>
-                                        <node concept="37vLTw" id="Hg6EncbtUj" role="37vLTx">
-                                          <ref role="3cqZAo" node="Hg6EncbtU6" resolve="error" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3y3z36" id="Hg6EncbtUk" role="3clFbw">
-                                    <node concept="10Nm6u" id="Hg6EncbtUl" role="3uHU7w" />
-                                    <node concept="37vLTw" id="Hg6EncbtUm" role="3uHU7B">
-                                      <ref role="3cqZAo" node="Hg6EncbtU6" resolve="error" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="3cpWsn" id="Hg6EncbtUn" role="1Duv9x">
-                                <property role="TrG5h" value="ref" />
-                                <node concept="3uibUv" id="Hg6EncbtUo" role="1tU5fm">
-                                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="Hg6EncbtUp" role="1DdaDG">
-                                <node concept="37vLTw" id="Hg6EncbtUq" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="Hg6EncbtTw" resolve="typesCollector" />
-                                </node>
-                                <node concept="liA8E" id="Hg6EncbtUr" role="2OqNvi">
-                                  <ref role="37wK5l" to="tj24:5tpkEj3JFVt" resolve="errorNodeReferences" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="Hg6EncbtUs" role="ukAjM">
-                          <node concept="37vLTw" id="6kREIVkNZx8" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6kREIVkNFsd" resolve="mpsProject" />
-                          </node>
-                          <node concept="liA8E" id="Hg6EncbtUw" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="Hg6EncbtUx" role="3cqZAp" />
-                      <node concept="1QHqEM" id="Hg6EncbtUy" role="3cqZAp">
-                        <node concept="1QHqEC" id="Hg6EncbtUz" role="1QHqEI">
-                          <node concept="3clFbS" id="Hg6EncbtU$" role="1bW5cS">
-                            <node concept="3clFbF" id="Hg6EncbtU_" role="3cqZAp">
-                              <node concept="2OqwBi" id="Hg6EncbtUA" role="3clFbG">
-                                <node concept="37vLTw" id="Hg6EncbtUB" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="Hg6EncbtTb" resolve="modelOwner" />
-                                </node>
-                                <node concept="liA8E" id="Hg6EncbtUC" role="2OqNvi">
-                                  <ref role="37wK5l" to="umch:2zU3cYq$pNG" resolve="register" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2OqwBi" id="Hg6EncbtUD" role="ukAjM">
-                          <node concept="37vLTw" id="6kREIVkNVJp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6kREIVkNFsd" resolve="mpsProject" />
-                          </node>
-                          <node concept="liA8E" id="Hg6EncbtUH" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbH" id="Hg6EncbtUI" role="3cqZAp" />
-                      <node concept="3clFbJ" id="6IQb_Rx8n8I" role="3cqZAp">
-                        <node concept="3clFbS" id="6IQb_Rx8n8K" role="3clFbx">
-                          <node concept="3clFbF" id="Hg6EncbtUJ" role="3cqZAp">
-                            <node concept="2YIFZM" id="Hg6EncbtUK" role="3clFbG">
-                              <ref role="1Pybhc" node="41ox5VnpFrR" resolve="MarkPlugin" />
-                              <ref role="37wK5l" node="41ox5VnqukP" resolve="markTypesAndErrors" />
-                              <node concept="37vLTw" id="6kREIVkNRWj" role="37wK5m">
-                                <ref role="3cqZAo" node="6kREIVkNFsd" resolve="mpsProject" />
-                              </node>
-                              <node concept="2OqwBi" id="Hg6EncbtUO" role="37wK5m">
-                                <node concept="Xjq3P" id="Hg6EncbtUP" role="2Oq$k0" />
-                                <node concept="2OwXpG" id="Hg6EncbtUQ" role="2OqNvi">
-                                  <ref role="2Oxat5" node="1pPth$lGU8f" resolve="editorComponent" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="Hg6EncbtUR" role="37wK5m">
-                                <node concept="2OqwBi" id="Hg6EncbtUS" role="2Oq$k0">
-                                  <node concept="Xjq3P" id="Hg6EncbtUT" role="2Oq$k0" />
-                                  <node concept="2OwXpG" id="Hg6EncbtUU" role="2OqNvi">
-                                    <ref role="2Oxat5" node="1pPth$lGU8f" resolve="editorComponent" />
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="Hg6EncbtUV" role="2OqNvi">
-                                  <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="Hg6EncbtUW" role="37wK5m">
-                                <node concept="2OwXpG" id="Hg6EncbtUX" role="2OqNvi">
-                                  <ref role="2Oxat5" node="52a_GfIIGna" resolve="typeNodes" />
-                                </node>
-                                <node concept="Xjq3P" id="Hg6EncbtUY" role="2Oq$k0" />
-                              </node>
-                              <node concept="2OqwBi" id="Hg6EncbtUZ" role="37wK5m">
-                                <node concept="Xjq3P" id="Hg6EncbtV0" role="2Oq$k0" />
-                                <node concept="2OwXpG" id="Hg6EncbtV1" role="2OqNvi">
-                                  <ref role="2Oxat5" node="5tpkEj3KeIf" resolve="errors" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="Hg6EncbtV2" role="37wK5m">
-                                <node concept="1eOMI4" id="6IQb_Rx8t5B" role="2Oq$k0">
-                                  <node concept="10QFUN" id="6IQb_Rx8t5$" role="1eOMHV">
-                                    <node concept="3uibUv" id="6IQb_Rx8wCH" role="10QFUM">
-                                      <ref role="3uigEE" node="55Q$YFtIVEP" resolve="EvaluateRulesWithTraceStep" />
-                                    </node>
-                                    <node concept="37vLTw" id="6IQb_Rx8t5D" role="10QFUP">
-                                      <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="liA8E" id="6kREIVl1k82" role="2OqNvi">
-                                  <ref role="37wK5l" node="6kREIVl0T6j" resolve="getTraceTabs" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="2ZW3vV" id="6IQb_Rx8pVG" role="3clFbw">
-                          <node concept="3uibUv" id="6IQb_Rx8ru0" role="2ZW6by">
-                            <ref role="3uigEE" node="55Q$YFtIVEP" resolve="EvaluateRulesWithTraceStep" />
-                          </node>
-                          <node concept="37vLTw" id="6IQb_Rx8owj" role="2ZW6bz">
-                            <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3y3z36" id="Hg6EncbtV5" role="3clFbw">
-                      <node concept="10Nm6u" id="Hg6EncbtV6" role="3uHU7w" />
-                      <node concept="2OqwBi" id="Hg6EncbtV7" role="3uHU7B">
-                        <node concept="37vLTw" id="Hg6EncbtV8" role="2Oq$k0">
+                      <node concept="2OqwBi" id="6IQb_RxPObD" role="37wK5m">
+                        <node concept="37vLTw" id="6IQb_RxPNIu" role="2Oq$k0">
                           <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
                         </node>
-                        <node concept="liA8E" id="6kREIVl1gyr" role="2OqNvi">
-                          <ref role="37wK5l" to="tj24:6kREIVl0T6d" resolve="getStoreView" />
+                        <node concept="liA8E" id="6IQb_RxPP5r" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:6IQb_RxlNhw" resolve="getTypeNodes" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="6IQb_RxPQDW" role="37wK5m">
+                        <node concept="37vLTw" id="6IQb_RxPQ40" role="2Oq$k0">
+                          <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
+                        </node>
+                        <node concept="liA8E" id="6IQb_RxPRci" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:6IQb_RxlNhC" resolve="getErrors" />
+                        </node>
+                      </node>
+                      <node concept="2OqwBi" id="Hg6EncbtV2" role="37wK5m">
+                        <node concept="liA8E" id="6kREIVl1k82" role="2OqNvi">
+                          <ref role="37wK5l" to="tj24:6IQb_RxxZcl" resolve="getTraceTabComponents" />
+                        </node>
+                        <node concept="37vLTw" id="6IQb_RxSokf" role="2Oq$k0">
+                          <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
                         </node>
                       </node>
                     </node>
                   </node>
                   <node concept="3clFbH" id="Hg6EncbtWm" role="3cqZAp" />
-                  <node concept="1QHqEK" id="Hg6EncbtWn" role="3cqZAp">
-                    <node concept="1QHqEC" id="Hg6EncbtWo" role="1QHqEI">
-                      <node concept="3clFbS" id="Hg6EncbtWp" role="1bW5cS">
-                        <node concept="3clFbJ" id="6IQb_Rx8A1H" role="3cqZAp">
-                          <node concept="3clFbS" id="6IQb_Rx8A1J" role="3clFbx">
-                            <node concept="3clFbJ" id="Hg6EncbtWq" role="3cqZAp">
-                              <node concept="3clFbS" id="Hg6EncbtWr" role="3clFbx">
-                                <node concept="1DcWWT" id="Hg6EncbtWs" role="3cqZAp">
-                                  <node concept="3clFbS" id="Hg6EncbtWt" role="2LFqv$">
-                                    <node concept="3SKdUt" id="Hg6EncbtWu" role="3cqZAp">
-                                      <node concept="3SKdUq" id="Hg6EncbtWv" role="3SKWNk">
-                                        <property role="3SKdUp" value="actually show the trace" />
-                                      </node>
-                                    </node>
-                                    <node concept="3clFbF" id="Hg6EncbtWw" role="3cqZAp">
-                                      <node concept="2OqwBi" id="Hg6EncbtWx" role="3clFbG">
-                                        <node concept="37vLTw" id="Hg6EncbtWy" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="Hg6EncbtWD" resolve="tt" />
-                                        </node>
-                                        <node concept="liA8E" id="Hg6EncbtWz" role="2OqNvi">
-                                          <ref role="37wK5l" node="6_UQWSXcgLF" resolve="setContextEditorComponent" />
-                                          <node concept="37vLTw" id="Hg6EncbtW$" role="37wK5m">
-                                            <ref role="3cqZAo" node="1pPth$lGU8f" resolve="editorComponent" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="3clFbF" id="Hg6EncbtW_" role="3cqZAp">
-                                      <node concept="2OqwBi" id="Hg6EncbtWA" role="3clFbG">
-                                        <node concept="37vLTw" id="Hg6EncbtWB" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="Hg6EncbtWD" resolve="tt" />
-                                        </node>
-                                        <node concept="liA8E" id="Hg6EncbtWC" role="2OqNvi">
-                                          <ref role="37wK5l" node="5X6ji59xVZa" resolve="refreshActivation" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="3cpWsn" id="Hg6EncbtWD" role="1Duv9x">
-                                    <property role="TrG5h" value="tt" />
-                                    <node concept="3uibUv" id="Hg6EncbtWE" role="1tU5fm">
-                                      <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
-                                    </node>
-                                  </node>
-                                  <node concept="2OqwBi" id="Hg6EncbtWF" role="1DdaDG">
-                                    <node concept="1eOMI4" id="6IQb_Rx8I_p" role="2Oq$k0">
-                                      <node concept="10QFUN" id="6IQb_Rx8I_m" role="1eOMHV">
-                                        <node concept="3uibUv" id="6IQb_Rx8Kbc" role="10QFUM">
-                                          <ref role="3uigEE" node="55Q$YFtIVEP" resolve="EvaluateRulesWithTraceStep" />
-                                        </node>
-                                        <node concept="37vLTw" id="6IQb_Rx8I_r" role="10QFUP">
-                                          <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="6kREIVl1eJs" role="2OqNvi">
-                                      <ref role="37wK5l" node="6kREIVl0T6j" resolve="getTraceTabs" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="3clFbF" id="Hg6EncbtWI" role="3cqZAp">
-                                  <node concept="2OqwBi" id="Hg6EncbtWJ" role="3clFbG">
-                                    <node concept="2YIFZM" id="Hg6EncbtWK" role="2Oq$k0">
-                                      <ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
-                                      <ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
-                                      <node concept="37vLTw" id="6kREIVkNKhb" role="37wK5m">
-                                        <ref role="3cqZAo" node="6kREIVkNFsd" resolve="mpsProject" />
-                                      </node>
-                                    </node>
-                                    <node concept="liA8E" id="Hg6EncbtWO" role="2OqNvi">
-                                      <ref role="37wK5l" node="Nob1E3CTMt" resolve="showTool" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="Hg6EncbtWP" role="3clFbw">
-                                <node concept="2OqwBi" id="Hg6EncbtWQ" role="2Oq$k0">
-                                  <node concept="1eOMI4" id="6IQb_Rx8FDd" role="2Oq$k0">
-                                    <node concept="10QFUN" id="6IQb_Rx8FDa" role="1eOMHV">
-                                      <node concept="3uibUv" id="6IQb_Rx8FDf" role="10QFUM">
-                                        <ref role="3uigEE" node="55Q$YFtIVEP" resolve="EvaluateRulesWithTraceStep" />
-                                      </node>
-                                      <node concept="37vLTw" id="6IQb_Rx8FDg" role="10QFUP">
-                                        <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                  <node concept="liA8E" id="6kREIVl1cWI" role="2OqNvi">
-                                    <ref role="37wK5l" node="6kREIVl0T6j" resolve="getTraceTabs" />
-                                  </node>
-                                </node>
-                                <node concept="3GX2aA" id="Hg6EncbtWT" role="2OqNvi" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2ZW3vV" id="6IQb_Rx8Bgt" role="3clFbw">
-                            <node concept="3uibUv" id="6IQb_Rx8Bgu" role="2ZW6by">
-                              <ref role="3uigEE" node="55Q$YFtIVEP" resolve="EvaluateRulesWithTraceStep" />
-                            </node>
-                            <node concept="37vLTw" id="6IQb_Rx8Bgv" role="2ZW6bz">
-                              <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="Hg6EncbtWU" role="ukAjM">
-                      <node concept="37vLTw" id="6kREIVkNOaX" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6kREIVkNFsd" resolve="mpsProject" />
-                      </node>
-                      <node concept="liA8E" id="Hg6EncbtWY" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="Hg6Encbt3C" role="3cqZAp" />
                   <node concept="3clFbF" id="Hg6Encbtxl" role="3cqZAp">
                     <node concept="Xjq3P" id="Hg6Encbtxj" role="3clFbG" />
                   </node>
@@ -27638,49 +27338,11 @@
       </node>
     </node>
     <node concept="2tJIrI" id="Hg6EncbjnH" role="jymVt" />
-    <node concept="312cEg" id="52a_GfIIGna" role="jymVt">
-      <property role="TrG5h" value="typeNodes" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tm6S6" id="6kREIVkHUS0" role="1B3o_S" />
-      <node concept="3rvAFt" id="52a_GfIIGnc" role="1tU5fm">
-        <node concept="3Tqbb2" id="52a_GfIIHWf" role="3rvSg0" />
-        <node concept="3uibUv" id="52a_GfIIGne" role="3rvQeY">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="52a_GfIIGnf" role="33vP2m">
-        <node concept="3rGOSV" id="52a_GfIIGng" role="2ShVmc">
-          <node concept="3uibUv" id="52a_GfIIGnh" role="3rHrn6">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
-          <node concept="3Tqbb2" id="52a_GfIIInF" role="3rHtpV" />
-        </node>
-      </node>
-    </node>
-    <node concept="312cEg" id="5tpkEj3KeIf" role="jymVt">
-      <property role="TrG5h" value="errors" />
-      <property role="3TUv4t" value="false" />
-      <node concept="3Tm6S6" id="6kREIVkHWyL" role="1B3o_S" />
-      <node concept="3rvAFt" id="5tpkEj3KeIh" role="1tU5fm">
-        <node concept="17QB3L" id="5tpkEj3Kpu_" role="3rvSg0" />
-        <node concept="3uibUv" id="5tpkEj3KeIj" role="3rvQeY">
-          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="5tpkEj3KeIk" role="33vP2m">
-        <node concept="3rGOSV" id="5tpkEj3KeIl" role="2ShVmc">
-          <node concept="3uibUv" id="5tpkEj3KeIm" role="3rHrn6">
-            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
-          </node>
-          <node concept="17QB3L" id="5tpkEj3Kqua" role="3rHtpV" />
-        </node>
-      </node>
-    </node>
     <node concept="3Tm1VV" id="3F6vMxq_2US" role="1B3o_S" />
     <node concept="3uibUv" id="1pPth$lC2Ed" role="1zkMxy">
       <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
-      <node concept="3uibUv" id="YgAcJaVl1F" role="11_B2D">
-        <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+      <node concept="3uibUv" id="6IQb_RxDhRE" role="11_B2D">
+        <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
       </node>
     </node>
     <node concept="312cEg" id="1pPth$lGU8f" role="jymVt">
@@ -27703,6 +27365,12 @@
     <property role="TrG5h" value="EvaluateRulesWithTraceStep" />
     <node concept="2tJIrI" id="55Q$YFtIVLz" role="jymVt" />
     <node concept="3clFbW" id="55Q$YFtIVZ9" role="jymVt">
+      <node concept="37vLTG" id="6IQb_Rxsk$b" role="3clF46">
+        <property role="TrG5h" value="editorComponent" />
+        <node concept="3uibUv" id="6IQb_Rxsk$c" role="1tU5fm">
+          <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+        </node>
+      </node>
       <node concept="37vLTG" id="55Q$YFtIX9v" role="3clF46">
         <property role="TrG5h" value="mpsProject" />
         <node concept="3uibUv" id="55Q$YFtIX9w" role="1tU5fm">
@@ -27718,6 +27386,19 @@
             <ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
           </node>
         </node>
+        <node concept="3clFbF" id="6IQb_RxteBU" role="3cqZAp">
+          <node concept="37vLTI" id="6IQb_RxtgtS" role="3clFbG">
+            <node concept="37vLTw" id="6IQb_RxtgVI" role="37vLTx">
+              <ref role="3cqZAo" node="6IQb_Rxsk$b" resolve="editorComponent" />
+            </node>
+            <node concept="2OqwBi" id="6IQb_RxtePB" role="37vLTJ">
+              <node concept="Xjq3P" id="6IQb_RxteBS" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6IQb_Rxtfpa" role="2OqNvi">
+                <ref role="2Oxat5" node="6IQb_Rxsgb3" resolve="editorComponent" />
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="55Q$YFtJq2k" role="jymVt" />
@@ -27832,29 +27513,60 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="Hg6EncXnuq" role="3cqZAp">
-                          <node concept="2OqwBi" id="Hg6EncXnur" role="3clFbG">
-                            <node concept="2OqwBi" id="Hg6EncXnus" role="2Oq$k0">
-                              <node concept="Xjq3P" id="Hg6EncXnut" role="2Oq$k0" />
-                              <node concept="liA8E" id="55Q$YFtJGOX" role="2OqNvi">
-                                <ref role="37wK5l" node="6kREIVl0T6j" resolve="getTraceTabs" />
+                        <node concept="3cpWs8" id="6IQb_Rxph$E" role="3cqZAp">
+                          <node concept="3cpWsn" id="6IQb_Rxph$F" role="3cpWs9">
+                            <property role="TrG5h" value="openTab" />
+                            <node concept="3uibUv" id="6IQb_Rxph$B" role="1tU5fm">
+                              <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+                            </node>
+                            <node concept="2OqwBi" id="6IQb_Rxph$G" role="33vP2m">
+                              <node concept="37vLTw" id="6IQb_Rxph$H" role="2Oq$k0">
+                                <ref role="3cqZAo" node="Hg6EncXnuk" resolve="activationTrace" />
+                              </node>
+                              <node concept="liA8E" id="6IQb_Rxph$I" role="2OqNvi">
+                                <ref role="37wK5l" node="7nPD14Nb$fz" resolve="openTab" />
+                                <node concept="2OqwBi" id="6IQb_Rxph$J" role="37wK5m">
+                                  <node concept="37vLTw" id="6IQb_Rxph$K" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="Hg6EncXnuK" resolve="program" />
+                                  </node>
+                                  <node concept="liA8E" id="6IQb_Rxph$L" role="2OqNvi">
+                                    <ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
+                                  </node>
+                                </node>
                               </node>
                             </node>
-                            <node concept="TSZUe" id="Hg6EncXnuv" role="2OqNvi">
-                              <node concept="2OqwBi" id="Hg6EncXnuw" role="25WWJ7">
-                                <node concept="37vLTw" id="Hg6EncXnux" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="Hg6EncXnuk" resolve="activationTrace" />
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="6IQb_RxS2eX" role="3cqZAp">
+                          <node concept="2OqwBi" id="6IQb_RxS6MS" role="3clFbG">
+                            <node concept="2OqwBi" id="6IQb_RxS3tz" role="2Oq$k0">
+                              <node concept="Xjq3P" id="6IQb_RxS2eV" role="2Oq$k0" />
+                              <node concept="2OwXpG" id="6IQb_RxS4TP" role="2OqNvi">
+                                <ref role="2Oxat5" node="6IQb_RxRUPR" resolve="traceTabs" />
+                              </node>
+                            </node>
+                            <node concept="TSZUe" id="6IQb_RxS8FU" role="2OqNvi">
+                              <node concept="37vLTw" id="6IQb_RxSc3P" role="25WWJ7">
+                                <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openTab" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="6IQb_RxsFCj" role="3cqZAp">
+                          <node concept="2OqwBi" id="6IQb_RxsL_H" role="3clFbG">
+                            <node concept="2OqwBi" id="6IQb_RxsHi8" role="2Oq$k0">
+                              <node concept="Xjq3P" id="6IQb_RxsFCh" role="2Oq$k0" />
+                              <node concept="2OwXpG" id="6IQb_RxsJ8V" role="2OqNvi">
+                                <ref role="2Oxat5" node="6IQb_RxsBvb" resolve="traceTabComponents" />
+                              </node>
+                            </node>
+                            <node concept="TSZUe" id="6IQb_RxsNKt" role="2OqNvi">
+                              <node concept="2OqwBi" id="6IQb_RxRYGQ" role="25WWJ7">
+                                <node concept="37vLTw" id="6IQb_RxsSZ4" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openTab" />
                                 </node>
-                                <node concept="liA8E" id="Hg6EncXnuy" role="2OqNvi">
-                                  <ref role="37wK5l" node="7nPD14Nb$fz" resolve="openTab" />
-                                  <node concept="2OqwBi" id="Hg6EncXnuz" role="37wK5m">
-                                    <node concept="37vLTw" id="Hg6EncXnu$" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="Hg6EncXnuK" resolve="program" />
-                                    </node>
-                                    <node concept="liA8E" id="Hg6EncXnu_" role="2OqNvi">
-                                      <ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
-                                    </node>
-                                  </node>
+                                <node concept="liA8E" id="6IQb_RxRZZh" role="2OqNvi">
+                                  <ref role="37wK5l" node="5X6ji59z7r_" resolve="getTabComponent" />
                                 </node>
                               </node>
                             </node>
@@ -27863,14 +27575,8 @@
                         <node concept="3clFbF" id="Hg6EncXnuA" role="3cqZAp">
                           <node concept="37vLTI" id="Hg6EncXnuB" role="3clFbG">
                             <node concept="2OqwBi" id="Hg6EncXnuC" role="37vLTx">
-                              <node concept="2OqwBi" id="Hg6EncXnuD" role="2Oq$k0">
-                                <node concept="2OqwBi" id="Hg6EncXnuE" role="2Oq$k0">
-                                  <node concept="Xjq3P" id="Hg6EncXnuF" role="2Oq$k0" />
-                                  <node concept="liA8E" id="55Q$YFtJHYo" role="2OqNvi">
-                                    <ref role="37wK5l" node="6kREIVl0T6j" resolve="getTraceTabs" />
-                                  </node>
-                                </node>
-                                <node concept="1yVyf7" id="Hg6EncXnuH" role="2OqNvi" />
+                              <node concept="37vLTw" id="6IQb_Rxppsn" role="2Oq$k0">
+                                <ref role="3cqZAo" node="6IQb_Rxph$F" resolve="openTab" />
                               </node>
                               <node concept="liA8E" id="Hg6EncXnuI" role="2OqNvi">
                                 <ref role="37wK5l" node="YGS68MEx_L" resolve="trace" />
@@ -27912,13 +27618,103 @@
         </node>
         <node concept="3clFbH" id="Hg6EncXsVc" role="3cqZAp" />
         <node concept="3clFbF" id="55Q$YFtItJ0" role="3cqZAp">
-          <node concept="1rXfSq" id="55Q$YFtItIY" role="3clFbG">
-            <ref role="37wK5l" to="tj24:55Q$YFtHM07" resolve="scheduleWithTrace" />
-            <node concept="37vLTw" id="55Q$YFtIv91" role="37wK5m">
-              <ref role="3cqZAo" node="Hg6EncXntT" resolve="withTrace" />
+          <node concept="2OqwBi" id="6IQb_Rxsnrv" role="3clFbG">
+            <node concept="1rXfSq" id="55Q$YFtItIY" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:55Q$YFtHM07" resolve="scheduleWithTrace" />
+              <node concept="37vLTw" id="55Q$YFtIv91" role="37wK5m">
+                <ref role="3cqZAo" node="Hg6EncXntT" resolve="withTrace" />
+              </node>
+              <node concept="37vLTw" id="55Q$YFtIvC0" role="37wK5m">
+                <ref role="3cqZAo" node="6kREIVkNs$S" resolve="subscribeScheduler" />
+              </node>
             </node>
-            <node concept="37vLTw" id="55Q$YFtIvC0" role="37wK5m">
-              <ref role="3cqZAo" node="6kREIVkNs$S" resolve="subscribeScheduler" />
+            <node concept="liA8E" id="6IQb_Rxsum7" role="2OqNvi">
+              <ref role="37wK5l" to="unkn:~Single.doFinally(io.reactivex.functions.Action):io.reactivex.Single" resolve="doFinally" />
+              <node concept="1bVj0M" id="6IQb_Rxswo2" role="37wK5m">
+                <node concept="3clFbS" id="6IQb_Rxswo3" role="1bW5cS">
+                  <node concept="3clFbH" id="6IQb_Rxsy3D" 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="3clFbJ" id="6IQb_Rxsy5I" role="3cqZAp">
+                          <node concept="3clFbS" id="6IQb_Rxsy5J" role="3clFbx">
+                            <node concept="1DcWWT" id="6IQb_Rxsy5K" role="3cqZAp">
+                              <node concept="3clFbS" id="6IQb_Rxsy5L" role="2LFqv$">
+                                <node concept="3SKdUt" id="6IQb_Rxsy5M" role="3cqZAp">
+                                  <node concept="3SKdUq" id="6IQb_Rxsy5N" role="3SKWNk">
+                                    <property role="3SKdUp" value="actually show the trace" />
+                                  </node>
+                                </node>
+                                <node concept="3clFbF" id="6IQb_Rxsy5O" role="3cqZAp">
+                                  <node concept="2OqwBi" id="6IQb_Rxsy5P" role="3clFbG">
+                                    <node concept="37vLTw" id="6IQb_Rxsy5Q" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="6IQb_Rxsy5X" resolve="tt" />
+                                    </node>
+                                    <node concept="liA8E" id="6IQb_Rxsy5R" role="2OqNvi">
+                                      <ref role="37wK5l" node="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="6IQb_Rxsy5V" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="6IQb_Rxsy5X" resolve="tt" />
+                                    </node>
+                                    <node concept="liA8E" id="6IQb_Rxsy5W" role="2OqNvi">
+                                      <ref role="37wK5l" node="5X6ji59xVZa" resolve="refreshActivation" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWsn" id="6IQb_Rxsy5X" role="1Duv9x">
+                                <property role="TrG5h" value="tt" />
+                                <node concept="3uibUv" id="6IQb_RxsWlQ" role="1tU5fm">
+                                  <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="6IQb_RxSgwu" role="1DdaDG">
+                                <ref role="3cqZAo" node="6IQb_RxRUPR" resolve="traceTabs" />
+                              </node>
+                            </node>
+                            <node concept="3clFbF" id="6IQb_Rxsy65" role="3cqZAp">
+                              <node concept="2OqwBi" id="6IQb_Rxsy66" role="3clFbG">
+                                <node concept="2YIFZM" id="6IQb_Rxsy67" role="2Oq$k0">
+                                  <ref role="37wK5l" node="7nPD14Nboty" resolve="get" />
+                                  <ref role="1Pybhc" node="7nPD14Nbbbe" resolve="TraceComponent" />
+                                  <node concept="1rXfSq" id="6IQb_Rxt2cR" role="37wK5m">
+                                    <ref role="37wK5l" to="tj24:55Q$YFtJzDQ" resolve="getMpsProject" />
+                                  </node>
+                                </node>
+                                <node concept="liA8E" id="6IQb_Rxsy69" role="2OqNvi">
+                                  <ref role="37wK5l" node="Nob1E3CTMt" resolve="showTool" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2OqwBi" id="6IQb_Rxsy6a" role="3clFbw">
+                            <node concept="1rXfSq" id="6IQb_RxsAHK" role="2Oq$k0">
+                              <ref role="37wK5l" node="6kREIVl0T6j" resolve="getTraceTabComponents" />
+                            </node>
+                            <node concept="3GX2aA" id="6IQb_Rxsy6h" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="6IQb_Rxsy6l" role="ukAjM">
+                      <node concept="1rXfSq" id="6IQb_RxszRu" role="2Oq$k0">
+                        <ref role="37wK5l" to="tj24:55Q$YFtJzDQ" resolve="getMpsProject" />
+                      </node>
+                      <node concept="liA8E" id="6IQb_Rxsy6n" role="2OqNvi">
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="6IQb_Rxsy3F" role="3cqZAp" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -27929,42 +27725,193 @@
     </node>
     <node concept="2tJIrI" id="55Q$YFtIVL_" role="jymVt" />
     <node concept="3clFb_" id="6kREIVl0T6j" role="jymVt">
-      <property role="TrG5h" value="getTraceTabs" />
+      <property role="TrG5h" value="getTraceTabComponents" />
       <node concept="_YKpA" id="6kREIVl0T6k" role="3clF45">
-        <node concept="3uibUv" id="6kREIVl0T6l" role="_ZDj9">
-          <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
+        <node concept="3uibUv" id="6IQb_RxROcP" role="_ZDj9">
+          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
         </node>
       </node>
       <node concept="3Tm1VV" id="6kREIVl0T6m" role="1B3o_S" />
       <node concept="3clFbS" id="6kREIVl0T6n" role="3clF47">
         <node concept="3clFbF" id="6kREIVl0T6o" role="3cqZAp">
-          <node concept="37vLTw" id="6kREIVl0T6i" role="3clFbG">
-            <ref role="3cqZAo" node="YgAcJaUSxD" resolve="traceTabs" />
+          <node concept="37vLTw" id="6IQb_Rx$Mfp" role="3clFbG">
+            <ref role="3cqZAo" node="6IQb_RxsBvb" resolve="traceTabComponents" />
           </node>
         </node>
       </node>
     </node>
     <node concept="2tJIrI" id="6IQb_Rx3dyL" role="jymVt" />
-    <node concept="312cEg" id="YgAcJaUSxD" role="jymVt">
+    <node concept="312cEg" id="6IQb_Rxsgb3" role="jymVt">
+      <property role="TrG5h" value="editorComponent" />
+      <node concept="3Tm6S6" id="6IQb_Rxsgb4" role="1B3o_S" />
+      <node concept="3uibUv" id="6IQb_Rxsgb5" role="1tU5fm">
+        <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+      </node>
+    </node>
+    <node concept="312cEg" id="6IQb_RxRUPR" role="jymVt">
       <property role="TrG5h" value="traceTabs" />
-      <node concept="3Tm6S6" id="6kREIVl18QF" role="1B3o_S" />
-      <node concept="_YKpA" id="5cnt3vhcsrL" role="1tU5fm">
-        <node concept="3uibUv" id="5cnt3vhcsrM" role="_ZDj9">
+      <node concept="3Tm6S6" id="6IQb_RxRUPS" role="1B3o_S" />
+      <node concept="_YKpA" id="6IQb_RxRUPT" role="1tU5fm">
+        <node concept="3uibUv" id="6IQb_RxSdj3" role="_ZDj9">
           <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
         </node>
       </node>
-      <node concept="2ShNRf" id="5cnt3vhcuM3" role="33vP2m">
-        <node concept="Tc6Ow" id="5cnt3vhcuyu" role="2ShVmc">
-          <node concept="3uibUv" id="5cnt3vhcuyv" role="HW$YZ">
+      <node concept="2ShNRf" id="6IQb_RxRUPV" role="33vP2m">
+        <node concept="Tc6Ow" id="6IQb_RxRUPW" role="2ShVmc">
+          <node concept="3uibUv" id="6IQb_RxSeSX" role="HW$YZ">
             <ref role="3uigEE" node="5X6ji59z5Fa" resolve="TraceTab" />
           </node>
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="6IQb_RxsBvb" role="jymVt">
+      <property role="TrG5h" value="traceTabComponents" />
+      <node concept="3Tm6S6" id="6IQb_RxsBvc" role="1B3o_S" />
+      <node concept="_YKpA" id="6IQb_RxsBvd" role="1tU5fm">
+        <node concept="3uibUv" id="6IQb_RxRQS7" role="_ZDj9">
+          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="6IQb_RxsBvf" role="33vP2m">
+        <node concept="Tc6Ow" id="6IQb_RxsBvg" role="2ShVmc">
+          <node concept="3uibUv" id="6IQb_RxRP6h" role="HW$YZ">
+            <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="3Tm1VV" id="55Q$YFtIVEQ" role="1B3o_S" />
     <node concept="3uibUv" id="55Q$YFtIVLc" role="1zkMxy">
       <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
     </node>
   </node>
+  <node concept="312cEu" id="6IQb_RxxWnM">
+    <property role="3GE5qa" value="typechecking.step" />
+    <property role="TrG5h" value="CollectTypesWithTraceStep" />
+    <node concept="2tJIrI" id="6IQb_RxxY1V" role="jymVt" />
+    <node concept="3clFbW" id="6IQb_RxxY2V" role="jymVt">
+      <node concept="3cqZAl" id="6IQb_RxxY2W" role="3clF45" />
+      <node concept="3Tm1VV" id="6IQb_RxxY2X" role="1B3o_S" />
+      <node concept="37vLTG" id="6IQb_RxxY35" role="3clF46">
+        <property role="TrG5h" value="mpsProject" />
+        <node concept="3uibUv" id="6IQb_RxxY36" role="1tU5fm">
+          <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="6IQb_RxxY37" role="3clF47">
+        <node concept="XkiVB" id="6IQb_RxxY39" role="3cqZAp">
+          <ref role="37wK5l" to="tj24:6IQb_RxlCdT" resolve="CollectTypesStep" />
+          <node concept="37vLTw" id="6IQb_RxxY38" role="37wK5m">
+            <ref role="3cqZAo" node="6IQb_RxxY35" resolve="mpsProject" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_Rxy0ff" role="jymVt" />
+    <node concept="3clFb_" id="6IQb_Rxy0n8" role="jymVt">
+      <property role="TrG5h" value="schedule" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="37vLTG" id="6IQb_Rxy0n9" role="3clF46">
+        <property role="TrG5h" value="prevStep" />
+        <node concept="3uibUv" id="6IQb_Rxy0na" role="1tU5fm">
+          <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
+          <node concept="3uibUv" id="6IQb_Rxy0nb" role="11_B2D">
+            <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6IQb_Rxy0nc" role="3clF46">
+        <property role="TrG5h" value="subscribeScheduler" />
+        <node concept="3uibUv" id="6IQb_Rxy0nd" role="1tU5fm">
+          <ref role="3uigEE" to="unkn:~Scheduler" resolve="Scheduler" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="6IQb_Rxy0ne" role="3clF45">
+        <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
+        <node concept="3qUE_q" id="6IQb_Rxy0nf" role="11_B2D">
+          <node concept="3uibUv" id="6IQb_Rxy0ng" role="3qUE_r">
+            <ref role="3uigEE" to="tj24:1pPth$lAzAx" resolve="Step" />
+            <node concept="3qTvmN" id="6IQb_Rxy0nh" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="6IQb_Rxy0ni" role="1B3o_S" />
+      <node concept="2AHcQZ" id="6IQb_Rxy0p8" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="3clFbS" id="6IQb_Rxy0p9" role="3clF47">
+        <node concept="3clFbF" id="6IQb_RxQvVx" role="3cqZAp">
+          <node concept="3nyPlj" id="6IQb_RxQvVv" role="3clFbG">
+            <ref role="37wK5l" to="tj24:6IQb_RxlBuz" resolve="schedule" />
+            <node concept="2OqwBi" id="6IQb_Rxy5oe" role="37wK5m">
+              <node concept="37vLTw" id="6IQb_Rxy4$J" role="2Oq$k0">
+                <ref role="3cqZAo" node="6IQb_Rxy0n9" resolve="prevStep" />
+              </node>
+              <node concept="liA8E" id="6IQb_Rxy6dP" role="2OqNvi">
+                <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+                <node concept="1bVj0M" id="6IQb_Rxy6ZJ" role="37wK5m">
+                  <node concept="37vLTG" id="6IQb_Rxy7xS" role="1bW2Oz">
+                    <property role="TrG5h" value="prev" />
+                    <node concept="3uibUv" id="6IQb_RxyaYM" role="1tU5fm">
+                      <ref role="3uigEE" to="tj24:1pPth$lBNWG" resolve="EvaluateRulesStep" />
+                    </node>
+                  </node>
+                  <node concept="3clFbS" id="6IQb_Rxy6ZK" role="1bW5cS">
+                    <node concept="3clFbH" id="6IQb_Rxy8CJ" role="3cqZAp" />
+                    <node concept="3clFbJ" id="6IQb_Rxy2AL" role="3cqZAp">
+                      <node concept="3clFbS" id="6IQb_Rxy2AN" role="3clFbx">
+                        <node concept="3clFbF" id="6IQb_RxSBDn" role="3cqZAp">
+                          <node concept="1rXfSq" id="6IQb_RxSBDl" role="3clFbG">
+                            <ref role="37wK5l" to="tj24:6IQb_RxSsvE" resolve="setTraceTabComponents" />
+                            <node concept="2OqwBi" id="6IQb_RxSCQE" role="37wK5m">
+                              <node concept="1eOMI4" id="6IQb_RxSCQF" role="2Oq$k0">
+                                <node concept="10QFUN" id="6IQb_RxSCQG" role="1eOMHV">
+                                  <node concept="3uibUv" id="6IQb_RxSCQH" role="10QFUM">
+                                    <ref role="3uigEE" node="55Q$YFtIVEP" resolve="EvaluateRulesWithTraceStep" />
+                                  </node>
+                                  <node concept="37vLTw" id="6IQb_RxSCQI" role="10QFUP">
+                                    <ref role="3cqZAo" node="6IQb_Rxy7xS" resolve="prev" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="6IQb_RxSCQJ" role="2OqNvi">
+                                <ref role="37wK5l" node="6kREIVl0T6j" resolve="getTraceTabComponents" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2ZW3vV" id="6IQb_Rxyacm" role="3clFbw">
+                        <node concept="3uibUv" id="6IQb_RxybJK" role="2ZW6by">
+                          <ref role="3uigEE" node="55Q$YFtIVEP" resolve="EvaluateRulesWithTraceStep" />
+                        </node>
+                        <node concept="37vLTw" id="6IQb_Rxyiwr" role="2ZW6bz">
+                          <ref role="3cqZAo" node="6IQb_Rxy7xS" resolve="prev" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="6IQb_RxyhEU" role="3cqZAp" />
+                    <node concept="3clFbF" id="6IQb_Rxyi65" role="3cqZAp">
+                      <node concept="37vLTw" id="6IQb_RxQtPz" role="3clFbG">
+                        <ref role="3cqZAo" node="6IQb_Rxy7xS" resolve="prev" />
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="6IQb_Rxy8CO" role="3cqZAp" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="6IQb_RxQze1" role="37wK5m">
+              <ref role="3cqZAo" node="6IQb_Rxy0nc" resolve="subscribeScheduler" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="3Tm1VV" id="6IQb_RxxWnN" role="1B3o_S" />
+    <node concept="3uibUv" id="6IQb_RxxWs3" role="1zkMxy">
+      <ref role="3uigEE" to="tj24:6IQb_RxlB9v" resolve="CollectTypesStep" />
+    </node>
+  </node>
 </model>
 
diff --git a/typechecking/solutions/jetbrains.mps.typechecking/models/typechecking.mps b/typechecking/solutions/jetbrains.mps.typechecking/models/typechecking.mps
index b21cd8c7..f6190256 100644
--- a/typechecking/solutions/jetbrains.mps.typechecking/models/typechecking.mps
+++ b/typechecking/solutions/jetbrains.mps.typechecking/models/typechecking.mps
@@ -45,6 +45,7 @@
     <import index="1m72" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.components(MPS.IDEA/)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="bj13" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.logical(jetbrains.mps.logic.reactor/)" />
+    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -4538,7 +4539,6 @@
     <property role="TrG5h" value="EvaluateRulesStep" />
     <property role="3GE5qa" value="typechecking.step" />
     <node concept="2tJIrI" id="6nJA6bpU6gp" role="jymVt" />
-    <node concept="2tJIrI" id="6kREIVkRdhe" role="jymVt" />
     <node concept="3clFbW" id="1pPth$lHpLU" role="jymVt">
       <node concept="3cqZAl" id="1pPth$lHpLW" role="3clF45" />
       <node concept="3Tm1VV" id="6kREIVkRwNu" role="1B3o_S" />
@@ -7492,28 +7492,6 @@
           </node>
         </node>
         <node concept="3clFbH" id="7y50OW6XU80" role="3cqZAp" />
-        <node concept="3cpWs8" id="6kREIVkUaqX" role="3cqZAp">
-          <node concept="3cpWsn" id="6kREIVkUaqY" role="3cpWs9">
-            <property role="TrG5h" value="runTypechecking" />
-            <property role="3TUv4t" value="true" />
-            <node concept="3uibUv" id="6kREIVkUaqZ" role="1tU5fm">
-              <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
-            </node>
-            <node concept="2ShNRf" id="6kREIVkUar0" role="33vP2m">
-              <node concept="1pGfFk" id="6kREIVkUar1" role="2ShVmc">
-                <ref role="37wK5l" node="1pPth$lHpLU" resolve="EvaluateRulesStep" />
-                <node concept="10QFUN" id="6kREIVkUaQz" role="37wK5m">
-                  <node concept="37vLTw" id="6kREIVkUaQ$" role="10QFUP">
-                    <ref role="3cqZAo" node="7y50OW6XU7s" resolve="prj" />
-                  </node>
-                  <node concept="3uibUv" id="6kREIVkUaQ_" role="10QFUM">
-                    <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="3cpWs8" id="6kREIVkZsFR" role="3cqZAp">
           <node concept="3cpWsn" id="6kREIVkZsFS" role="3cpWs9">
             <property role="TrG5h" value="applyTemplatesStep" />
@@ -7538,6 +7516,49 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="6kREIVkUaqX" role="3cqZAp">
+          <node concept="3cpWsn" id="6kREIVkUaqY" role="3cpWs9">
+            <property role="TrG5h" value="evaluateRulesStep" />
+            <property role="3TUv4t" value="true" />
+            <node concept="3uibUv" id="6kREIVkUaqZ" role="1tU5fm">
+              <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
+            </node>
+            <node concept="2ShNRf" id="6kREIVkUar0" role="33vP2m">
+              <node concept="1pGfFk" id="6kREIVkUar1" role="2ShVmc">
+                <ref role="37wK5l" node="1pPth$lHpLU" resolve="EvaluateRulesStep" />
+                <node concept="10QFUN" id="6kREIVkUaQz" role="37wK5m">
+                  <node concept="37vLTw" id="6kREIVkUaQ$" role="10QFUP">
+                    <ref role="3cqZAo" node="7y50OW6XU7s" resolve="prj" />
+                  </node>
+                  <node concept="3uibUv" id="6kREIVkUaQ_" role="10QFUM">
+                    <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="6IQb_RxEixy" role="3cqZAp">
+          <node concept="3cpWsn" id="6IQb_RxEixz" role="3cpWs9">
+            <property role="TrG5h" value="collectTypesStep" />
+            <node concept="3uibUv" id="6IQb_RxEixx" role="1tU5fm">
+              <ref role="3uigEE" node="6IQb_RxlB9v" resolve="CollectTypesStep" />
+            </node>
+            <node concept="2ShNRf" id="6IQb_RxEix$" role="33vP2m">
+              <node concept="1pGfFk" id="6IQb_RxEix_" role="2ShVmc">
+                <ref role="37wK5l" node="6IQb_RxlCdT" resolve="CollectTypesStep" />
+                <node concept="10QFUN" id="6IQb_RxEixA" role="37wK5m">
+                  <node concept="37vLTw" id="6IQb_RxEixB" role="10QFUP">
+                    <ref role="3cqZAo" node="7y50OW6XU7s" resolve="prj" />
+                  </node>
+                  <node concept="3uibUv" id="6IQb_RxEixC" role="10QFUM">
+                    <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="7y50OW6XU81" role="3cqZAp">
           <node concept="3cpWsn" id="7y50OW6XU82" role="3cpWs9">
             <property role="TrG5h" value="helper" />
@@ -7554,7 +7575,10 @@
                   <ref role="3cqZAo" node="6kREIVkZsFS" resolve="applyTemplatesStep" />
                 </node>
                 <node concept="37vLTw" id="6kREIVkZqU_" role="37wK5m">
-                  <ref role="3cqZAo" node="6kREIVkUaqY" resolve="runTypechecking" />
+                  <ref role="3cqZAo" node="6kREIVkUaqY" resolve="evaluateRulesStep" />
+                </node>
+                <node concept="37vLTw" id="6IQb_RxEjI9" role="37wK5m">
+                  <ref role="3cqZAo" node="6IQb_RxEixz" resolve="collectTypesStep" />
                 </node>
               </node>
             </node>
@@ -7788,7 +7812,7 @@
                     <node concept="3clFbF" id="7y50OW6Yx01" role="3cqZAp">
                       <node concept="2OqwBi" id="7y50OW6YxsM" role="3clFbG">
                         <node concept="37vLTw" id="7y50OW6Yx00" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6kREIVkUaqY" resolve="runTypechecking" />
+                          <ref role="3cqZAo" node="6kREIVkUaqY" resolve="evaluateRulesStep" />
                         </node>
                         <node concept="liA8E" id="7y50OW6YVID" role="2OqNvi">
                           <ref role="37wK5l" node="7y50OW6WPl4" resolve="getTypeTerm" />
@@ -8615,5 +8639,507 @@
       </node>
     </node>
   </node>
+  <node concept="312cEu" id="6IQb_RxlB9v">
+    <property role="3GE5qa" value="typechecking.step" />
+    <property role="TrG5h" value="CollectTypesStep" />
+    <node concept="2tJIrI" id="6IQb_RxlBub" role="jymVt" />
+    <node concept="3clFbW" id="6IQb_RxlCdT" role="jymVt">
+      <node concept="3cqZAl" id="6IQb_RxlCdV" role="3clF45" />
+      <node concept="3Tm1VV" id="6IQb_RxlCdW" role="1B3o_S" />
+      <node concept="3clFbS" id="6IQb_RxlCdX" role="3clF47">
+        <node concept="3clFbF" id="6IQb_RxlCw$" role="3cqZAp">
+          <node concept="37vLTI" id="6IQb_RxlCwA" role="3clFbG">
+            <node concept="2OqwBi" id="6IQb_RxlCWT" role="37vLTJ">
+              <node concept="Xjq3P" id="6IQb_RxlCXY" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6IQb_RxlCWW" role="2OqNvi">
+                <ref role="2Oxat5" node="6IQb_RxlCww" resolve="mpsProject" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6IQb_RxlCwE" role="37vLTx">
+              <ref role="3cqZAo" node="6IQb_RxlCnz" resolve="mpsProject" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6IQb_RxlCnz" role="3clF46">
+        <property role="TrG5h" value="mpsProject" />
+        <node concept="3uibUv" id="6IQb_RxlCny" role="1tU5fm">
+          <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_RxlC4$" role="jymVt" />
+    <node concept="3clFb_" id="6IQb_RxlBuO" role="jymVt">
+      <property role="TrG5h" value="info" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="17QB3L" id="6IQb_RxlBuP" role="3clF45" />
+      <node concept="3Tmbuc" id="6IQb_RxlBuQ" role="1B3o_S" />
+      <node concept="3clFbS" id="6IQb_RxlBuS" role="3clF47">
+        <node concept="3clFbF" id="6IQb_RxlC0p" role="3cqZAp">
+          <node concept="Xl_RD" id="6IQb_RxlC0o" role="3clFbG">
+            <property role="Xl_RC" value="collect types" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6IQb_RxlBuT" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_RxlBud" role="jymVt" />
+    <node concept="3clFb_" id="6IQb_RxlBuz" role="jymVt">
+      <property role="TrG5h" value="schedule" />
+      <property role="1EzhhJ" value="false" />
+      <node concept="37vLTG" id="6IQb_RxlBu$" role="3clF46">
+        <property role="TrG5h" value="prevStep" />
+        <node concept="3uibUv" id="6IQb_RxlBu_" role="1tU5fm">
+          <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
+          <node concept="3uibUv" id="6IQb_RxlBuJ" role="11_B2D">
+            <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6IQb_RxlBuB" role="3clF46">
+        <property role="TrG5h" value="subscribeScheduler" />
+        <node concept="3uibUv" id="6IQb_RxlBuC" role="1tU5fm">
+          <ref role="3uigEE" to="unkn:~Scheduler" resolve="Scheduler" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="6IQb_RxlBuD" role="3clF45">
+        <ref role="3uigEE" to="unkn:~Single" resolve="Single" />
+        <node concept="3qUE_q" id="6IQb_RxlBuE" role="11_B2D">
+          <node concept="3uibUv" id="6IQb_RxlBuF" role="3qUE_r">
+            <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+            <node concept="3qTvmN" id="6IQb_RxlBuG" role="11_B2D" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tmbuc" id="6IQb_RxlBuH" role="1B3o_S" />
+      <node concept="3clFbS" id="6IQb_RxlBuK" role="3clF47">
+        <node concept="3clFbF" id="Hg6EncbncW" role="3cqZAp">
+          <node concept="2OqwBi" id="Hg6EncbnP3" role="3clFbG">
+            <node concept="37vLTw" id="Hg6EncbncU" role="2Oq$k0">
+              <ref role="3cqZAo" node="6IQb_RxlBu$" resolve="prevStep" />
+            </node>
+            <node concept="liA8E" id="Hg6EncbpkJ" role="2OqNvi">
+              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+              <node concept="1bVj0M" id="Hg6EncbqUM" role="37wK5m">
+                <node concept="37vLTG" id="Hg6EncbrFm" role="1bW2Oz">
+                  <property role="TrG5h" value="prev" />
+                  <node concept="3uibUv" id="Hg6Encbstd" role="1tU5fm">
+                    <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="Hg6EncbqUN" role="1bW5cS">
+                  <node concept="3clFbH" id="6IQb_RxQssB" role="3cqZAp" />
+                  <node concept="3clFbJ" id="Hg6EncbtT8" role="3cqZAp">
+                    <node concept="3clFbS" id="Hg6EncbtT9" role="3clFbx">
+                      <node concept="3cpWs8" id="Hg6EncbtTa" role="3cqZAp">
+                        <node concept="3cpWsn" id="Hg6EncbtTb" role="3cpWs9">
+                          <property role="TrG5h" value="modelOwner" />
+                          <node concept="3uibUv" id="Hg6EncbtTc" role="1tU5fm">
+                            <ref role="3uigEE" to="umch:2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
+                          </node>
+                          <node concept="2OqwBi" id="Hg6EncbtTd" role="33vP2m">
+                            <node concept="2YIFZM" id="Hg6EncbtTe" role="2Oq$k0">
+                              <ref role="37wK5l" to="umch:2zU3cYqxb_u" resolve="get" />
+                              <ref role="1Pybhc" to="umch:2zU3cYqxbbL" resolve="TypesModelManager" />
+                              <node concept="2OqwBi" id="Hg6EncbtTf" role="37wK5m">
+                                <node concept="37vLTw" id="6kREIVkO3rx" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6IQb_RxlCww" resolve="mpsProject" />
+                                </node>
+                                <node concept="liA8E" id="Hg6EncbtTj" role="2OqNvi">
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="Hg6EncbtTk" role="2OqNvi">
+                              <ref role="37wK5l" to="umch:2zU3cYq$52j" resolve="emptyModel" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3cpWs8" id="Hg6EncbtTl" role="3cqZAp">
+                        <node concept="3cpWsn" id="Hg6EncbtTm" role="3cpWs9">
+                          <property role="TrG5h" value="typeModel" />
+                          <node concept="H_c77" id="Hg6EncbtTn" role="1tU5fm" />
+                          <node concept="2OqwBi" id="Hg6EncbtTo" role="33vP2m">
+                            <node concept="37vLTw" id="Hg6EncbtTp" role="2Oq$k0">
+                              <ref role="3cqZAo" node="Hg6EncbtTb" resolve="modelOwner" />
+                            </node>
+                            <node concept="liA8E" id="Hg6EncbtTq" role="2OqNvi">
+                              <ref role="37wK5l" to="umch:2zU3cYq$9HD" resolve="model" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="Hg6EncbtTr" role="3cqZAp" />
+                      <node concept="1QHqEK" id="Hg6EncbtTs" role="3cqZAp">
+                        <node concept="1QHqEC" id="Hg6EncbtTt" role="1QHqEI">
+                          <node concept="3clFbS" id="Hg6EncbtTu" role="1bW5cS">
+                            <node concept="3cpWs8" id="Hg6EncbtTv" role="3cqZAp">
+                              <node concept="3cpWsn" id="Hg6EncbtTw" role="3cpWs9">
+                                <property role="TrG5h" value="typesCollector" />
+                                <node concept="3uibUv" id="Hg6EncbtTx" role="1tU5fm">
+                                  <ref role="3uigEE" node="6HT7BWBSFOV" resolve="TypeCollector" />
+                                </node>
+                                <node concept="2ShNRf" id="Hg6EncbtTy" role="33vP2m">
+                                  <node concept="1pGfFk" id="Hg6EncbtTz" role="2ShVmc">
+                                    <ref role="37wK5l" node="1CcQBrQmOiH" resolve="TypeCollector" />
+                                    <node concept="2OqwBi" id="Hg6EncbtT$" role="37wK5m">
+                                      <node concept="37vLTw" id="Hg6EncbtT_" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
+                                      </node>
+                                      <node concept="liA8E" id="6kREIVl1ilt" role="2OqNvi">
+                                        <ref role="37wK5l" node="6kREIVl0T6d" resolve="getStoreView" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1DcWWT" id="Hg6EncbtTB" role="3cqZAp">
+                              <node concept="3clFbS" id="Hg6EncbtTC" role="2LFqv$">
+                                <node concept="3cpWs8" id="Hg6EncbtTD" role="3cqZAp">
+                                  <node concept="3cpWsn" id="Hg6EncbtTE" role="3cpWs9">
+                                    <property role="TrG5h" value="typeNode" />
+                                    <node concept="3Tqbb2" id="Hg6EncbtTF" role="1tU5fm" />
+                                    <node concept="2OqwBi" id="Hg6EncbtTG" role="33vP2m">
+                                      <node concept="37vLTw" id="Hg6EncbtTH" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="Hg6EncbtTw" resolve="typesCollector" />
+                                      </node>
+                                      <node concept="liA8E" id="Hg6EncbtTI" role="2OqNvi">
+                                        <ref role="37wK5l" node="1CcQBrQmO_H" resolve="typeNode" />
+                                        <node concept="37vLTw" id="Hg6EncbtTJ" role="37wK5m">
+                                          <ref role="3cqZAo" node="Hg6EncbtTY" resolve="ref" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="Hg6EncbtTK" role="3cqZAp">
+                                  <node concept="3clFbS" id="Hg6EncbtTL" role="3clFbx">
+                                    <node concept="3clFbF" id="Hg6EncbtTM" role="3cqZAp">
+                                      <node concept="37vLTI" id="Hg6EncbtTN" role="3clFbG">
+                                        <node concept="3EllGN" id="Hg6EncbtTO" role="37vLTJ">
+                                          <node concept="37vLTw" id="Hg6EncbtTP" role="3ElVtu">
+                                            <ref role="3cqZAo" node="Hg6EncbtTY" resolve="ref" />
+                                          </node>
+                                          <node concept="37vLTw" id="Hg6EncbtTQ" role="3ElQJh">
+                                            <ref role="3cqZAo" node="52a_GfIIGna" resolve="typeNodes" />
+                                          </node>
+                                        </node>
+                                        <node concept="2OqwBi" id="Hg6EncbtTR" role="37vLTx">
+                                          <node concept="37vLTw" id="Hg6EncbtTS" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="Hg6EncbtTm" resolve="typeModel" />
+                                          </node>
+                                          <node concept="3BYIHo" id="Hg6EncbtTT" role="2OqNvi">
+                                            <node concept="37vLTw" id="Hg6EncbtTU" role="3BYIHq">
+                                              <ref role="3cqZAo" node="Hg6EncbtTE" resolve="typeNode" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3y3z36" id="Hg6EncbtTV" role="3clFbw">
+                                    <node concept="10Nm6u" id="Hg6EncbtTW" role="3uHU7w" />
+                                    <node concept="37vLTw" id="Hg6EncbtTX" role="3uHU7B">
+                                      <ref role="3cqZAo" node="Hg6EncbtTE" resolve="typeNode" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWsn" id="Hg6EncbtTY" role="1Duv9x">
+                                <property role="TrG5h" value="ref" />
+                                <node concept="3uibUv" id="Hg6EncbtTZ" role="1tU5fm">
+                                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                                </node>
+                              </node>
+                              <node concept="2OqwBi" id="Hg6EncbtU0" role="1DdaDG">
+                                <node concept="37vLTw" id="Hg6EncbtU1" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="Hg6EncbtTw" resolve="typesCollector" />
+                                </node>
+                                <node concept="liA8E" id="Hg6EncbtU2" role="2OqNvi">
+                                  <ref role="37wK5l" node="1CcQBrQnllM" resolve="typedNodeReferences" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="1DcWWT" id="Hg6EncbtU3" role="3cqZAp">
+                              <node concept="3clFbS" id="Hg6EncbtU4" role="2LFqv$">
+                                <node concept="3cpWs8" id="Hg6EncbtU5" role="3cqZAp">
+                                  <node concept="3cpWsn" id="Hg6EncbtU6" role="3cpWs9">
+                                    <property role="TrG5h" value="error" />
+                                    <node concept="17QB3L" id="Hg6EncbtU7" role="1tU5fm" />
+                                    <node concept="2OqwBi" id="Hg6EncbtU8" role="33vP2m">
+                                      <node concept="37vLTw" id="Hg6EncbtU9" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="Hg6EncbtTw" resolve="typesCollector" />
+                                      </node>
+                                      <node concept="liA8E" id="Hg6EncbtUa" role="2OqNvi">
+                                        <ref role="37wK5l" node="5tpkEj3JHbg" resolve="error" />
+                                        <node concept="37vLTw" id="Hg6EncbtUb" role="37wK5m">
+                                          <ref role="3cqZAo" node="Hg6EncbtUn" resolve="ref" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="3clFbJ" id="Hg6EncbtUc" role="3cqZAp">
+                                  <node concept="3clFbS" id="Hg6EncbtUd" role="3clFbx">
+                                    <node concept="3clFbF" id="Hg6EncbtUe" role="3cqZAp">
+                                      <node concept="37vLTI" id="Hg6EncbtUf" role="3clFbG">
+                                        <node concept="3EllGN" id="Hg6EncbtUg" role="37vLTJ">
+                                          <node concept="37vLTw" id="Hg6EncbtUh" role="3ElVtu">
+                                            <ref role="3cqZAo" node="Hg6EncbtUn" resolve="ref" />
+                                          </node>
+                                          <node concept="37vLTw" id="Hg6EncbtUi" role="3ElQJh">
+                                            <ref role="3cqZAo" node="5tpkEj3KeIf" resolve="errors" />
+                                          </node>
+                                        </node>
+                                        <node concept="37vLTw" id="Hg6EncbtUj" role="37vLTx">
+                                          <ref role="3cqZAo" node="Hg6EncbtU6" resolve="error" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3y3z36" id="Hg6EncbtUk" role="3clFbw">
+                                    <node concept="10Nm6u" id="Hg6EncbtUl" role="3uHU7w" />
+                                    <node concept="37vLTw" id="Hg6EncbtUm" role="3uHU7B">
+                                      <ref role="3cqZAo" node="Hg6EncbtU6" resolve="error" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="3cpWsn" id="Hg6EncbtUn" role="1Duv9x">
+                                <property role="TrG5h" value="ref" />
+                                <node concept="3uibUv" id="Hg6EncbtUo" role="1tU5fm">
+                                  <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+                                </node>
+                              </node>
+                              <node concept="2OqwBi" id="Hg6EncbtUp" role="1DdaDG">
+                                <node concept="37vLTw" id="Hg6EncbtUq" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="Hg6EncbtTw" resolve="typesCollector" />
+                                </node>
+                                <node concept="liA8E" id="Hg6EncbtUr" role="2OqNvi">
+                                  <ref role="37wK5l" node="5tpkEj3JFVt" resolve="errorNodeReferences" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="2OqwBi" id="Hg6EncbtUs" role="ukAjM">
+                          <node concept="37vLTw" id="6kREIVkNZx8" role="2Oq$k0">
+                            <ref role="3cqZAo" node="6IQb_RxlCww" resolve="mpsProject" />
+                          </node>
+                          <node concept="liA8E" id="Hg6EncbtUw" role="2OqNvi">
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbH" id="Hg6EncbtUx" role="3cqZAp" />
+                      <node concept="3clFbF" id="Hg6EncbtU_" role="3cqZAp">
+                        <node concept="2OqwBi" id="Hg6EncbtUA" role="3clFbG">
+                          <node concept="37vLTw" id="Hg6EncbtUB" role="2Oq$k0">
+                            <ref role="3cqZAo" node="Hg6EncbtTb" resolve="modelOwner" />
+                          </node>
+                          <node concept="liA8E" id="Hg6EncbtUC" role="2OqNvi">
+                            <ref role="37wK5l" to="umch:2zU3cYq$pNG" resolve="register" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3y3z36" id="Hg6EncbtV5" role="3clFbw">
+                      <node concept="10Nm6u" id="Hg6EncbtV6" role="3uHU7w" />
+                      <node concept="2OqwBi" id="Hg6EncbtV7" role="3uHU7B">
+                        <node concept="37vLTw" id="Hg6EncbtV8" role="2Oq$k0">
+                          <ref role="3cqZAo" node="Hg6EncbrFm" resolve="prev" />
+                        </node>
+                        <node concept="liA8E" id="6kREIVl1gyr" role="2OqNvi">
+                          <ref role="37wK5l" node="6kREIVl0T6d" resolve="getStoreView" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3clFbH" id="Hg6Encbt3C" role="3cqZAp" />
+                  <node concept="3clFbF" id="Hg6Encbtxl" role="3cqZAp">
+                    <node concept="Xjq3P" id="Hg6Encbtxj" role="3clFbG" />
+                  </node>
+                  <node concept="3clFbH" id="6kREIVkxfHK" role="3cqZAp" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="6IQb_RxlBuL" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_RxlDF9" role="jymVt" />
+    <node concept="3clFb_" id="6IQb_RxlDSV" role="jymVt">
+      <property role="TrG5h" value="getMpsProject" />
+      <node concept="3uibUv" id="6IQb_RxlDSW" role="3clF45">
+        <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+      </node>
+      <node concept="3Tm1VV" id="6IQb_RxlDSX" role="1B3o_S" />
+      <node concept="3clFbS" id="6IQb_RxlDSY" role="3clF47">
+        <node concept="3clFbF" id="6IQb_RxlDSZ" role="3cqZAp">
+          <node concept="37vLTw" id="6IQb_RxlDSU" role="3clFbG">
+            <ref role="3cqZAo" node="6IQb_RxlCww" resolve="mpsProject" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_RxlUdU" role="jymVt" />
+    <node concept="3clFb_" id="6IQb_RxlNhw" role="jymVt">
+      <property role="TrG5h" value="getTypeNodes" />
+      <node concept="3rvAFt" id="6IQb_RxlNhx" role="3clF45">
+        <node concept="3Tqbb2" id="6IQb_RxlNhy" role="3rvSg0" />
+        <node concept="3uibUv" id="6IQb_RxlNhz" role="3rvQeY">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6IQb_RxlNh$" role="1B3o_S" />
+      <node concept="3clFbS" id="6IQb_RxlNh_" role="3clF47">
+        <node concept="3clFbF" id="6IQb_RxlNhA" role="3cqZAp">
+          <node concept="37vLTw" id="6IQb_RxlNhv" role="3clFbG">
+            <ref role="3cqZAo" node="52a_GfIIGna" resolve="typeNodes" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_RxlVZu" role="jymVt" />
+    <node concept="3clFb_" id="6IQb_RxlNhC" role="jymVt">
+      <property role="TrG5h" value="getErrors" />
+      <node concept="3rvAFt" id="6IQb_RxlNhD" role="3clF45">
+        <node concept="17QB3L" id="6IQb_RxlNhE" role="3rvSg0" />
+        <node concept="3uibUv" id="6IQb_RxlNhF" role="3rvQeY">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6IQb_RxlNhG" role="1B3o_S" />
+      <node concept="3clFbS" id="6IQb_RxlNhH" role="3clF47">
+        <node concept="3clFbF" id="6IQb_RxlNhI" role="3cqZAp">
+          <node concept="37vLTw" id="6IQb_RxlNhB" role="3clFbG">
+            <ref role="3cqZAo" node="5tpkEj3KeIf" resolve="errors" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_Rxy0fD" role="jymVt" />
+    <node concept="3clFb_" id="6IQb_RxxZcl" role="jymVt">
+      <property role="TrG5h" value="getTraceTabComponents" />
+      <node concept="_YKpA" id="6IQb_RxxZcm" role="3clF45">
+        <node concept="3uibUv" id="6IQb_RxRJyK" role="_ZDj9">
+          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6IQb_RxxZcn" role="1B3o_S" />
+      <node concept="3clFbS" id="6IQb_RxxZco" role="3clF47">
+        <node concept="3clFbF" id="6IQb_RxxZcp" role="3cqZAp">
+          <node concept="37vLTw" id="6IQb_RxxZcq" role="3clFbG">
+            <ref role="3cqZAo" node="6IQb_RxxZcr" resolve="traceTabComponents" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_RxxK8n" role="jymVt" />
+    <node concept="3clFb_" id="6IQb_RxSsvE" role="jymVt">
+      <property role="TrG5h" value="setTraceTabComponents" />
+      <node concept="3cqZAl" id="6IQb_RxSsvF" role="3clF45" />
+      <node concept="3Tmbuc" id="6IQb_RxS_IO" role="1B3o_S" />
+      <node concept="3clFbS" id="6IQb_RxSsvH" role="3clF47">
+        <node concept="3clFbF" id="6IQb_RxSsvI" role="3cqZAp">
+          <node concept="37vLTI" id="6IQb_RxSsvJ" role="3clFbG">
+            <node concept="37vLTw" id="6IQb_RxSsvK" role="37vLTx">
+              <ref role="3cqZAo" node="6IQb_RxSsvL" resolve="components" />
+            </node>
+            <node concept="2OqwBi" id="6IQb_RxTPUz" role="37vLTJ">
+              <node concept="Xjq3P" id="6IQb_RxTQet" role="2Oq$k0" />
+              <node concept="2OwXpG" id="6IQb_RxTQyi" role="2OqNvi">
+                <ref role="2Oxat5" node="6IQb_RxxZcr" resolve="traceTabComponents" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6IQb_RxSsvL" role="3clF46">
+        <property role="TrG5h" value="components" />
+        <node concept="_YKpA" id="6IQb_RxSsvM" role="1tU5fm">
+          <node concept="3uibUv" id="6IQb_RxSsvN" role="_ZDj9">
+            <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_Rxmj1p" role="jymVt" />
+    <node concept="3Tm1VV" id="6IQb_RxlB9w" role="1B3o_S" />
+    <node concept="3uibUv" id="6IQb_RxlBaQ" role="1zkMxy">
+      <ref role="3uigEE" node="1pPth$lAzAx" resolve="Step" />
+      <node concept="3uibUv" id="6IQb_RxlBjO" role="11_B2D">
+        <ref role="3uigEE" node="1pPth$lBNWG" resolve="EvaluateRulesStep" />
+      </node>
+    </node>
+    <node concept="312cEg" id="52a_GfIIGna" role="jymVt">
+      <property role="TrG5h" value="typeNodes" />
+      <property role="3TUv4t" value="false" />
+      <node concept="3Tm6S6" id="6kREIVkHUS0" role="1B3o_S" />
+      <node concept="3rvAFt" id="52a_GfIIGnc" role="1tU5fm">
+        <node concept="3Tqbb2" id="52a_GfIIHWf" role="3rvSg0" />
+        <node concept="3uibUv" id="52a_GfIIGne" role="3rvQeY">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="52a_GfIIGnf" role="33vP2m">
+        <node concept="3rGOSV" id="52a_GfIIGng" role="2ShVmc">
+          <node concept="3uibUv" id="52a_GfIIGnh" role="3rHrn6">
+            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+          </node>
+          <node concept="3Tqbb2" id="52a_GfIIInF" role="3rHtpV" />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="5tpkEj3KeIf" role="jymVt">
+      <property role="TrG5h" value="errors" />
+      <property role="3TUv4t" value="false" />
+      <node concept="3Tm6S6" id="6kREIVkHWyL" role="1B3o_S" />
+      <node concept="3rvAFt" id="5tpkEj3KeIh" role="1tU5fm">
+        <node concept="17QB3L" id="5tpkEj3Kpu_" role="3rvSg0" />
+        <node concept="3uibUv" id="5tpkEj3KeIj" role="3rvQeY">
+          <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="5tpkEj3KeIk" role="33vP2m">
+        <node concept="3rGOSV" id="5tpkEj3KeIl" role="2ShVmc">
+          <node concept="3uibUv" id="5tpkEj3KeIm" role="3rHrn6">
+            <ref role="3uigEE" to="mhbf:~SNodeReference" resolve="SNodeReference" />
+          </node>
+          <node concept="17QB3L" id="5tpkEj3Kqua" role="3rHtpV" />
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="6IQb_RxxZcr" role="jymVt">
+      <property role="TrG5h" value="traceTabComponents" />
+      <node concept="3Tm6S6" id="6IQb_RxxZcs" role="1B3o_S" />
+      <node concept="_YKpA" id="6IQb_RxxZct" role="1tU5fm">
+        <node concept="3uibUv" id="6IQb_RxRJRt" role="_ZDj9">
+          <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="6IQb_RxTRoA" role="33vP2m">
+        <node concept="Tc6Ow" id="6IQb_RxTTjf" role="2ShVmc">
+          <node concept="3uibUv" id="6IQb_RxTUBU" role="HW$YZ">
+            <ref role="3uigEE" to="dxuu:~JComponent" resolve="JComponent" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="312cEg" id="6IQb_RxlCww" role="jymVt">
+      <property role="TrG5h" value="mpsProject" />
+      <node concept="3Tm6S6" id="6IQb_RxlCwx" role="1B3o_S" />
+      <node concept="3uibUv" id="6IQb_RxlCwz" role="1tU5fm">
+        <ref role="3uigEE" to="z1c4:~MPSProject" resolve="MPSProject" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps
index 7812d566..95183f87 100644
--- a/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps
+++ b/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/models/jetbrains/mps/lang/typesystem2/helper/plugin.mps
@@ -11,17 +11,15 @@
   </languages>
   <imports>
     <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
-    <import index="tqvn" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.tempmodel(MPS.Core/)" />
     <import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
-    <import index="pa15" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.persistence(MPS.Core/)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
-    <import index="31cb" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.module(MPS.Core/)" />
-    <import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
+    <import index="4it6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.loading(MPS.Core/)" />
+    <import index="w0gx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project.structure.modules(MPS.Core/)" />
   </imports>
   <registry>
     <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin">
@@ -44,8 +42,11 @@
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
-      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
-        <child id="1154032183016" name="body" index="2LFqv$" />
+      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
+        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
+      </concept>
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+        <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -54,22 +55,19 @@
       <concept id="1197029447546" name="jetbrains.mps.baseLanguage.structure.FieldReferenceOperation" flags="nn" index="2OwXpG">
         <reference id="1197029500499" name="fieldDeclaration" index="2Oxat5" />
       </concept>
-      <concept id="1164879751025" name="jetbrains.mps.baseLanguage.structure.TryCatchStatement" flags="nn" index="SfApY">
-        <child id="1164879758292" name="body" index="SfCbr" />
-        <child id="1164903496223" name="catchClause" index="TEbGg" />
+      <concept id="1083260308424" name="jetbrains.mps.baseLanguage.structure.EnumConstantReference" flags="nn" index="Rm8GO">
+        <reference id="1083260308426" name="enumConstantDeclaration" index="Rm8GQ" />
+        <reference id="1144432896254" name="enumClass" index="1Px2BO" />
       </concept>
       <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
         <child id="1145553007750" name="creator" index="2ShVmc" />
       </concept>
-      <concept id="1164903280175" name="jetbrains.mps.baseLanguage.structure.CatchClause" flags="nn" index="TDmWw">
-        <child id="1164903359218" name="catchBody" index="TDEfX" />
-        <child id="1164903359217" name="throwable" index="TDEfY" />
-      </concept>
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
       <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
       <concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
+      <concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -80,17 +78,17 @@
       <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
         <child id="1164991057263" name="throwable" index="YScLw" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg">
+        <property id="8606350594693632173" name="isTransient" index="eg7rD" />
+        <property id="1240249534625" name="isVolatile" index="34CwA1" />
+      </concept>
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
+        <property id="1075300953594" name="abstractClass" index="1sVAO0" />
+        <property id="1221565133444" name="isFinal" index="1EXbeo" />
+        <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
-      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
-      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -104,11 +102,16 @@
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
       <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <property id="4276006055363816570" name="isSynchronized" index="od$2w" />
+        <property id="1181808852946" name="isFinal" index="DiZV1" />
+        <child id="1164879685961" name="throwsItem" index="Sfmx6" />
         <child id="1068580123133" name="returnType" index="3clF45" />
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
+      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_">
+        <property id="1178608670077" name="isAbstract" index="1EzhhJ" />
+      </concept>
       <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
@@ -125,6 +128,9 @@
         <property id="1068580123138" name="value" index="3clFbU" />
       </concept>
       <concept id="1068580123140" name="jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" flags="ig" index="3clFbW" />
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -145,7 +151,6 @@
       <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
-        <child id="1109201940907" name="parameter" index="11_B2D" />
       </concept>
       <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
@@ -155,12 +160,6 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
-      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
-        <child id="1144226360166" name="iterable" index="1DdaDG" />
-      </concept>
-      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
-        <child id="1144230900587" name="variable" index="1Duv9x" />
-      </concept>
       <concept id="6329021646629104957" name="jetbrains.mps.baseLanguage.structure.TextCommentPart" flags="nn" index="3SKdUq">
         <property id="6329021646629104958" name="text" index="3SKdUp" />
       </concept>
@@ -169,6 +168,7 @@
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+      <concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -187,14 +187,7 @@
       <concept id="8970989240999019143" name="jetbrains.mps.baseLanguage.javadoc.structure.TextCommentLinePart" flags="ng" index="1dT_AC">
         <property id="8970989240999019144" name="text" index="1dT_AB" />
       </concept>
-    </language>
-    <language id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging">
-      <concept id="1167227138527" name="jetbrains.mps.baseLanguage.logging.structure.LogStatement" flags="nn" index="34ab3g">
-        <property id="1167228628751" name="hasException" index="34fQS0" />
-        <property id="1167245565795" name="severity" index="35gtTG" />
-        <child id="1167227463056" name="logExpression" index="34bqiv" />
-        <child id="1167227561449" name="exception" index="34bMjA" />
-      </concept>
+      <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
@@ -217,7 +210,6 @@
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
-      <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
@@ -227,8 +219,6 @@
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1167380149909" name="jetbrains.mps.baseLanguage.collections.structure.RemoveElementOperation" flags="nn" index="3dhRuq" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
-      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
-      <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
     </language>
   </registry>
   <node concept="2DaZZR" id="2zU3cYqx4HT" />
@@ -471,123 +461,6 @@
       <node concept="3cqZAl" id="2zU3cYqyp11" role="3clF45" />
       <node concept="3Tm6S6" id="2zU3cYqypbP" role="1B3o_S" />
       <node concept="3clFbS" id="2zU3cYqyp13" role="3clF47">
-        <node concept="3SKdUt" id="2zU3cYqBqjW" role="3cqZAp">
-          <node concept="3SKdUq" id="2zU3cYqBqjY" role="3SKWNk">
-            <property role="3SKdUp" value="defensive copying" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="2zU3cYqBmFa" role="3cqZAp">
-          <node concept="3cpWsn" id="2zU3cYqBmFb" role="3cpWs9">
-            <property role="TrG5h" value="moduleOptionsCopy" />
-            <property role="3TUv4t" value="true" />
-            <node concept="_YKpA" id="2zU3cYqBmF6" role="1tU5fm">
-              <node concept="3uibUv" id="2zU3cYqBAIS" role="_ZDj9">
-                <ref role="3uigEE" to="tqvn:~TempModuleOptions" resolve="TempModuleOptions" />
-              </node>
-            </node>
-            <node concept="2OqwBi" id="2zU3cYqBW6d" role="33vP2m">
-              <node concept="2OqwBi" id="2zU3cYqBDgP" role="2Oq$k0">
-                <node concept="2OqwBi" id="2zU3cYqBLi7" role="2Oq$k0">
-                  <node concept="37vLTw" id="2zU3cYqBmFf" role="2Oq$k0">
-                    <ref role="3cqZAo" node="WJyfsglZQI" resolve="modelOwners" />
-                  </node>
-                  <node concept="3zZkjj" id="2zU3cYqBOUW" role="2OqNvi">
-                    <node concept="1bVj0M" id="2zU3cYqBOUY" role="23t8la">
-                      <node concept="3clFbS" id="2zU3cYqBOUZ" role="1bW5cS">
-                        <node concept="3clFbF" id="2zU3cYqBPDQ" role="3cqZAp">
-                          <node concept="3y3z36" id="2zU3cYqBS9V" role="3clFbG">
-                            <node concept="10Nm6u" id="2zU3cYqBSak" role="3uHU7w" />
-                            <node concept="2OqwBi" id="2zU3cYqBQo6" role="3uHU7B">
-                              <node concept="37vLTw" id="2zU3cYqBPDP" role="2Oq$k0">
-                                <ref role="3cqZAo" node="2zU3cYqBOV0" resolve="it" />
-                              </node>
-                              <node concept="2OwXpG" id="2zU3cYqBReN" role="2OqNvi">
-                                <ref role="2Oxat5" node="2zU3cYq$j_w" resolve="moduleOptions" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="2zU3cYqBOV0" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="2zU3cYqBOV1" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3$u5V9" id="2zU3cYqBFzf" role="2OqNvi">
-                  <node concept="1bVj0M" id="2zU3cYqBFzh" role="23t8la">
-                    <node concept="3clFbS" id="2zU3cYqBFzi" role="1bW5cS">
-                      <node concept="3clFbF" id="2zU3cYqBSTh" role="3cqZAp">
-                        <node concept="2OqwBi" id="2zU3cYqBT$H" role="3clFbG">
-                          <node concept="37vLTw" id="2zU3cYqBSTg" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2zU3cYqBFzj" resolve="it" />
-                          </node>
-                          <node concept="2OwXpG" id="2zU3cYqBUt0" role="2OqNvi">
-                            <ref role="2Oxat5" node="2zU3cYq$j_w" resolve="moduleOptions" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="2zU3cYqBFzj" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="2zU3cYqBFzk" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="ANE8D" id="2zU3cYqBX7a" role="2OqNvi" />
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="2zU3cYqBZLQ" role="3cqZAp">
-          <node concept="3clFbS" id="2zU3cYqBZLT" role="2LFqv$">
-            <node concept="SfApY" id="4Z$O9mrT38n" role="3cqZAp">
-              <node concept="3clFbS" id="4Z$O9mrT38p" role="SfCbr">
-                <node concept="3clFbF" id="2zU3cYqC1ex" role="3cqZAp">
-                  <node concept="2OqwBi" id="2zU3cYqC1kk" role="3clFbG">
-                    <node concept="37vLTw" id="2zU3cYqC1ew" role="2Oq$k0">
-                      <ref role="3cqZAo" node="2zU3cYqBZLU" resolve="owner" />
-                    </node>
-                    <node concept="liA8E" id="2zU3cYqC5_y" role="2OqNvi">
-                      <ref role="37wK5l" node="2zU3cYq$$V4" resolve="clear" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="4Z$O9mrT38o" role="3cqZAp" />
-              </node>
-              <node concept="TDmWw" id="4Z$O9mrT38q" role="TEbGg">
-                <node concept="3cpWsn" id="4Z$O9mrT38s" role="TDEfY">
-                  <property role="TrG5h" value="e" />
-                  <node concept="3uibUv" id="4Z$O9mrT3ko" role="1tU5fm">
-                    <ref role="3uigEE" to="wyt6:~RuntimeException" resolve="RuntimeException" />
-                  </node>
-                </node>
-                <node concept="3clFbS" id="4Z$O9mrT38w" role="TDEfX">
-                  <node concept="34ab3g" id="4Z$O9mrT3M1" role="3cqZAp">
-                    <property role="35gtTG" value="warn" />
-                    <property role="34fQS0" value="true" />
-                    <node concept="Xl_RD" id="4Z$O9mrT3M3" role="34bqiv">
-                      <property role="Xl_RC" value="unexpected exception" />
-                    </node>
-                    <node concept="37vLTw" id="4Z$O9mrT3M5" role="34bMjA">
-                      <ref role="3cqZAo" node="4Z$O9mrT38s" resolve="e" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="2zU3cYqBZLU" role="1Duv9x">
-            <property role="TrG5h" value="owner" />
-            <node concept="3uibUv" id="2zU3cYqBZLY" role="1tU5fm">
-              <ref role="3uigEE" node="2zU3cYq$91A" resolve="TypesModelManager.ModelOwner" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="2zU3cYqBZLZ" role="1DdaDG">
-            <ref role="3cqZAo" node="WJyfsglZQI" resolve="modelOwners" />
-          </node>
-        </node>
         <node concept="3clFbF" id="2zU3cYqC6I2" role="3cqZAp">
           <node concept="2OqwBi" id="2zU3cYqC8iB" role="3clFbG">
             <node concept="37vLTw" id="2zU3cYqC6I0" role="2Oq$k0">
@@ -596,49 +469,6 @@
             <node concept="2Kehj3" id="2zU3cYqC9TW" role="2OqNvi" />
           </node>
         </node>
-        <node concept="3clFbH" id="2zU3cYqCazM" role="3cqZAp" />
-        <node concept="3clFbF" id="4Z$O9mrQVbU" role="3cqZAp">
-          <node concept="2OqwBi" id="4Z$O9mrQWTg" role="3clFbG">
-            <node concept="2OqwBi" id="4Z$O9mrQWBQ" role="2Oq$k0">
-              <node concept="37vLTw" id="4Z$O9mrQVbS" role="2Oq$k0">
-                <ref role="3cqZAo" node="4Z$O9mrQQ_h" resolve="repository" />
-              </node>
-              <node concept="liA8E" id="4Z$O9mrQWLc" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
-              </node>
-            </node>
-            <node concept="liA8E" id="4Z$O9mrQXeZ" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.runWriteInEDT(java.lang.Runnable):void" resolve="runWriteInEDT" />
-              <node concept="1bVj0M" id="52a_GfISXNw" role="37wK5m">
-                <node concept="3clFbS" id="52a_GfISXNx" role="1bW5cS">
-                  <node concept="1DcWWT" id="2zU3cYqBGD1" role="3cqZAp">
-                    <node concept="3clFbS" id="2zU3cYqBGD4" role="2LFqv$">
-                      <node concept="3clFbF" id="2zU3cYqCca3" role="3cqZAp">
-                        <node concept="2OqwBi" id="2zU3cYqCchf" role="3clFbG">
-                          <node concept="37vLTw" id="2zU3cYqCca2" role="2Oq$k0">
-                            <ref role="3cqZAo" node="2zU3cYqBGD5" resolve="opt" />
-                          </node>
-                          <node concept="liA8E" id="2zU3cYqCcvy" role="2OqNvi">
-                            <ref role="37wK5l" to="tqvn:~TempModuleOptions.disposeModule():void" resolve="disposeModule" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWsn" id="2zU3cYqBGD5" role="1Duv9x">
-                      <property role="TrG5h" value="opt" />
-                      <node concept="3uibUv" id="2zU3cYqBGD9" role="1tU5fm">
-                        <ref role="3uigEE" to="tqvn:~TempModuleOptions" resolve="TempModuleOptions" />
-                      </node>
-                    </node>
-                    <node concept="37vLTw" id="2zU3cYqBGDa" role="1DdaDG">
-                      <ref role="3cqZAo" node="2zU3cYqBmFb" resolve="moduleOptionsCopy" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2tJIrI" id="2zU3cYqyojD" role="jymVt" />
@@ -649,6 +479,11 @@
       </node>
       <node concept="3Tm1VV" id="2zU3cYq$52m" role="1B3o_S" />
       <node concept="3clFbS" id="2zU3cYq$52n" role="3clF47">
+        <node concept="3SKdUt" id="6IQb_RxL8zH" role="3cqZAp">
+          <node concept="3SKdUq" id="6IQb_RxL8zJ" role="3SKWNk">
+            <property role="3SKdUp" value="TODO: record the owner?" />
+          </node>
+        </node>
         <node concept="3clFbF" id="2zU3cYq$Xcz" role="3cqZAp">
           <node concept="2ShNRf" id="2zU3cYq$Xcx" role="3clFbG">
             <node concept="1pGfFk" id="2zU3cYq$XlI" role="2ShVmc">
@@ -711,66 +546,6 @@
             </node>
           </node>
           <node concept="3clFbH" id="4Z$O9mrSQcC" role="3cqZAp" />
-          <node concept="3clFbJ" id="2zU3cYq$EHf" role="3cqZAp">
-            <node concept="3clFbS" id="2zU3cYq$EHh" role="3clFbx">
-              <node concept="3clFbF" id="2zU3cYq$Fc$" role="3cqZAp">
-                <node concept="37vLTI" id="2zU3cYq$FrN" role="3clFbG">
-                  <node concept="2OqwBi" id="2zU3cYq$FzK" role="37vLTJ">
-                    <node concept="Xjq3P" id="2zU3cYq$FsA" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="2zU3cYq$FKX" role="2OqNvi">
-                      <ref role="2Oxat5" node="2zU3cYq$j_w" resolve="moduleOptions" />
-                    </node>
-                  </node>
-                  <node concept="2YIFZM" id="WJyfsglMKW" role="37vLTx">
-                    <ref role="37wK5l" to="tqvn:~TempModuleOptions.forDefaultModule():jetbrains.mps.smodel.tempmodel.TempModuleOptions" resolve="forDefaultModule" />
-                    <ref role="1Pybhc" to="tqvn:~TempModuleOptions" resolve="TempModuleOptions" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="2zU3cYq$I3R" role="3cqZAp">
-                <node concept="37vLTI" id="2zU3cYq$I3T" role="3clFbG">
-                  <node concept="10QFUN" id="2zU3cYq$GN9" role="37vLTx">
-                    <node concept="3uibUv" id="2zU3cYq$GN5" role="10QFUM">
-                      <ref role="3uigEE" to="31cb:~SModuleBase" resolve="SModuleBase" />
-                    </node>
-                    <node concept="2OqwBi" id="2zU3cYq$GN6" role="10QFUP">
-                      <node concept="37vLTw" id="2zU3cYq$GN7" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2zU3cYq$j_w" resolve="moduleOptions" />
-                      </node>
-                      <node concept="liA8E" id="2zU3cYq$GN8" role="2OqNvi">
-                        <ref role="37wK5l" to="tqvn:~TempModuleOptions.createModule():org.jetbrains.mps.openapi.module.SModule" resolve="createModule" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="2zU3cYq$IeZ" role="37vLTJ">
-                    <node concept="Xjq3P" id="2zU3cYq$I88" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="2zU3cYq$ImR" role="2OqNvi">
-                      <ref role="2Oxat5" node="2zU3cYq$H4C" resolve="module" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbC" id="2zU3cYq$F7a" role="3clFbw">
-              <node concept="10Nm6u" id="2zU3cYq$F7_" role="3uHU7w" />
-              <node concept="37vLTw" id="2zU3cYq$EJu" role="3uHU7B">
-                <ref role="3cqZAo" node="2zU3cYq$j_w" resolve="moduleOptions" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="2zU3cYq$IHi" role="3cqZAp">
-            <node concept="2OqwBi" id="2zU3cYq$IU9" role="3clFbG">
-              <node concept="37vLTw" id="2zU3cYq$IHg" role="2Oq$k0">
-                <ref role="3cqZAo" node="2zU3cYq$H4C" resolve="module" />
-              </node>
-              <node concept="liA8E" id="2zU3cYq$JxY" role="2OqNvi">
-                <ref role="37wK5l" to="31cb:~SModuleBase.registerModel(jetbrains.mps.extapi.model.SModelBase):void" resolve="registerModel" />
-                <node concept="37vLTw" id="2zU3cYq$OAO" role="37wK5m">
-                  <ref role="3cqZAo" node="2zU3cYq$jg9" resolve="model" />
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3clFbF" id="4Z$O9mrT3Vl" role="3cqZAp">
             <node concept="37vLTI" id="4Z$O9mrT5ew" role="3clFbG">
               <node concept="3clFbT" id="4Z$O9mrT5kv" role="37vLTx">
@@ -785,13 +560,6 @@
             </node>
           </node>
         </node>
-        <node concept="P$JXv" id="2zU3cYq$r0o" role="lGtFl">
-          <node concept="TZ5HA" id="2zU3cYq$r0p" role="TZ5H$">
-            <node concept="1dT_AC" id="2zU3cYq$r0q" role="1dT_Ay">
-              <property role="1dT_AB" value="Must be called in a write action." />
-            </node>
-          </node>
-        </node>
       </node>
       <node concept="2tJIrI" id="2zU3cYq$pt_" role="jymVt" />
       <node concept="3clFb_" id="2zU3cYq$eDA" role="jymVt">
@@ -818,46 +586,16 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="4Z$O9mrSQjY" role="3cqZAp" />
-          <node concept="3clFbJ" id="2zU3cYq$lYg" role="3cqZAp">
-            <node concept="3y3z36" id="2zU3cYq$m78" role="3clFbw">
-              <node concept="10Nm6u" id="2zU3cYq$m8A" role="3uHU7w" />
-              <node concept="37vLTw" id="2zU3cYq$lZc" role="3uHU7B">
-                <ref role="3cqZAo" node="2zU3cYq$j_w" resolve="moduleOptions" />
-              </node>
-            </node>
-            <node concept="3clFbS" id="2zU3cYq$lYi" role="3clFbx">
-              <node concept="3clFbF" id="2zU3cYq$OTt" role="3cqZAp">
-                <node concept="2OqwBi" id="2zU3cYq$P4M" role="3clFbG">
-                  <node concept="37vLTw" id="2zU3cYq$OTr" role="2Oq$k0">
-                    <ref role="3cqZAo" node="2zU3cYq$H4C" resolve="module" />
-                  </node>
-                  <node concept="liA8E" id="2zU3cYq$Pgm" role="2OqNvi">
-                    <ref role="37wK5l" to="31cb:~SModuleBase.unregisterModel(jetbrains.mps.extapi.model.SModelBase):void" resolve="unregisterModel" />
-                    <node concept="37vLTw" id="2zU3cYq$PjI" role="37wK5m">
-                      <ref role="3cqZAo" node="2zU3cYq$jg9" resolve="model" />
-                    </node>
-                  </node>
+          <node concept="3clFbH" id="6IQb_RxJaL9" role="3cqZAp" />
+          <node concept="3clFbF" id="4Z$O9mrT5ui" role="3cqZAp">
+            <node concept="37vLTI" id="4Z$O9mrT5uj" role="3clFbG">
+              <node concept="3clFbT" id="4Z$O9mrT5uk" role="37vLTx" />
+              <node concept="2OqwBi" id="4Z$O9mrT5ul" role="37vLTJ">
+                <node concept="Xjq3P" id="4Z$O9mrT5um" role="2Oq$k0" />
+                <node concept="2OwXpG" id="4Z$O9mrT5un" role="2OqNvi">
+                  <ref role="2Oxat5" node="4Z$O9mrSM0j" resolve="registered" />
                 </node>
               </node>
-              <node concept="3clFbF" id="4Z$O9mrT5ui" role="3cqZAp">
-                <node concept="37vLTI" id="4Z$O9mrT5uj" role="3clFbG">
-                  <node concept="3clFbT" id="4Z$O9mrT5uk" role="37vLTx" />
-                  <node concept="2OqwBi" id="4Z$O9mrT5ul" role="37vLTJ">
-                    <node concept="Xjq3P" id="4Z$O9mrT5um" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="4Z$O9mrT5un" role="2OqNvi">
-                      <ref role="2Oxat5" node="4Z$O9mrSM0j" resolve="registered" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="P$JXv" id="2zU3cYq$slE" role="lGtFl">
-          <node concept="TZ5HA" id="2zU3cYq$slF" role="TZ5H$">
-            <node concept="1dT_AC" id="2zU3cYq$slG" role="1dT_Ay">
-              <property role="1dT_AB" value="Must be called in a write action." />
             </node>
           </node>
         </node>
@@ -886,28 +624,6 @@
             </node>
           </node>
           <node concept="3clFbH" id="4Z$O9mrSZDe" role="3cqZAp" />
-          <node concept="3clFbF" id="2zU3cYq$DZY" role="3cqZAp">
-            <node concept="37vLTI" id="2zU3cYq$E$n" role="3clFbG">
-              <node concept="10Nm6u" id="2zU3cYq$EA5" role="37vLTx" />
-              <node concept="2OqwBi" id="2zU3cYq$E9z" role="37vLTJ">
-                <node concept="Xjq3P" id="2zU3cYq$DZW" role="2Oq$k0" />
-                <node concept="2OwXpG" id="2zU3cYq$Enx" role="2OqNvi">
-                  <ref role="2Oxat5" node="2zU3cYq$j_w" resolve="moduleOptions" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="2zU3cYq$PIb" role="3cqZAp">
-            <node concept="37vLTI" id="2zU3cYq$QlQ" role="3clFbG">
-              <node concept="10Nm6u" id="2zU3cYq$QnH" role="37vLTx" />
-              <node concept="2OqwBi" id="2zU3cYq$PPm" role="37vLTJ">
-                <node concept="Xjq3P" id="2zU3cYq$PI9" role="2Oq$k0" />
-                <node concept="2OwXpG" id="2zU3cYq$PW4" role="2OqNvi">
-                  <ref role="2Oxat5" node="2zU3cYq$H4C" resolve="module" />
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3clFbF" id="2zU3cYq$CQ1" role="3cqZAp">
             <node concept="37vLTI" id="2zU3cYq$DGE" role="3clFbG">
               <node concept="10Nm6u" id="2zU3cYq$DQ8" role="37vLTx" />
@@ -927,100 +643,79 @@
         <node concept="3cqZAl" id="2zU3cYq$jOm" role="3clF45" />
         <node concept="3Tm6S6" id="2zU3cYq$jP8" role="1B3o_S" />
         <node concept="3clFbS" id="2zU3cYq$jOo" role="3clF47">
-          <node concept="3cpWs8" id="WJyfsglt8y" role="3cqZAp">
-            <node concept="3cpWsn" id="WJyfsglt8z" role="3cpWs9">
-              <property role="TrG5h" value="source" />
-              <node concept="3uibUv" id="WJyfsgnH9z" role="1tU5fm">
-                <ref role="3uigEE" to="pa15:~PersistenceUtil$InMemoryStreamDataSource" resolve="PersistenceUtil.InMemoryStreamDataSource" />
+          <node concept="3cpWs8" id="6IQb_RxKX90" role="3cqZAp">
+            <node concept="3cpWsn" id="6IQb_RxKX91" role="3cpWs9">
+              <property role="TrG5h" value="moduleRef" />
+              <node concept="3uibUv" id="6IQb_RxKX8W" role="1tU5fm">
+                <ref role="3uigEE" to="w0gx:~ModuleReference" resolve="ModuleReference" />
               </node>
-              <node concept="2ShNRf" id="WJyfsglt8_" role="33vP2m">
-                <node concept="1pGfFk" id="WJyfsglt8A" role="2ShVmc">
-                  <ref role="37wK5l" to="pa15:~PersistenceUtil$InMemoryStreamDataSource.&lt;init&gt;()" resolve="PersistenceUtil.InMemoryStreamDataSource" />
+              <node concept="2ShNRf" id="6IQb_RxKX92" role="33vP2m">
+                <node concept="1pGfFk" id="6IQb_RxKX93" role="2ShVmc">
+                  <ref role="37wK5l" to="w0gx:~ModuleReference.&lt;init&gt;(java.lang.String,org.jetbrains.mps.openapi.module.SModuleId)" resolve="ModuleReference" />
+                  <node concept="Xl_RD" id="6IQb_RxKX94" role="37wK5m">
+                    <property role="Xl_RC" value="TYPES" />
+                  </node>
+                  <node concept="2YIFZM" id="6IQb_RxKX95" role="37wK5m">
+                    <ref role="37wK5l" to="z1c3:~ModuleId.regular():jetbrains.mps.project.ModuleId" resolve="regular" />
+                    <ref role="1Pybhc" to="z1c3:~ModuleId" resolve="ModuleId" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3cpWs8" id="WJyfsglt8B" role="3cqZAp">
-            <node concept="3cpWsn" id="WJyfsglt8C" role="3cpWs9">
-              <property role="TrG5h" value="options" />
-              <node concept="3uibUv" id="WJyfsglt8D" role="1tU5fm">
-                <ref role="3uigEE" to="33ny:~Map" resolve="Map" />
-                <node concept="3uibUv" id="WJyfsglt8E" role="11_B2D">
-                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                </node>
-                <node concept="3uibUv" id="WJyfsglt8F" role="11_B2D">
-                  <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-                </node>
+          <node concept="3cpWs8" id="6IQb_RxKZ4s" role="3cqZAp">
+            <node concept="3cpWsn" id="6IQb_RxKZ4t" role="3cpWs9">
+              <property role="TrG5h" value="modelRef" />
+              <node concept="3uibUv" id="6IQb_RxKZ4i" role="1tU5fm">
+                <ref role="3uigEE" to="w1kc:~SModelReference" resolve="SModelReference" />
               </node>
-              <node concept="2YIFZM" id="WJyfsglt8G" role="33vP2m">
-                <ref role="37wK5l" to="33ny:~Collections.singletonMap(java.lang.Object,java.lang.Object):java.util.Map" resolve="singletonMap" />
-                <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                <node concept="10M0yZ" id="WJyfsglt8H" role="37wK5m">
-                  <ref role="3cqZAo" to="dush:~ModelFactory.OPTION_MODELNAME" resolve="OPTION_MODELNAME" />
-                  <ref role="1PxDUh" to="dush:~ModelFactory" resolve="ModelFactory" />
-                </node>
-                <node concept="Xl_RD" id="WJyfsglt8I" role="37wK5m">
-                  <property role="Xl_RC" value="types-model" />
+              <node concept="2ShNRf" id="6IQb_RxKZ4u" role="33vP2m">
+                <node concept="1pGfFk" id="6IQb_RxKZ4v" role="2ShVmc">
+                  <ref role="37wK5l" to="w1kc:~SModelReference.&lt;init&gt;(org.jetbrains.mps.openapi.module.SModuleReference,org.jetbrains.mps.openapi.model.SModelId,java.lang.String)" resolve="SModelReference" />
+                  <node concept="37vLTw" id="6IQb_RxKZ4w" role="37wK5m">
+                    <ref role="3cqZAo" node="6IQb_RxKX91" resolve="moduleRef" />
+                  </node>
+                  <node concept="2YIFZM" id="6IQb_RxKZ4x" role="37wK5m">
+                    <ref role="37wK5l" to="w1kc:~SModelId.generate():jetbrains.mps.smodel.SModelId" resolve="generate" />
+                    <ref role="1Pybhc" to="w1kc:~SModelId" resolve="SModelId" />
+                  </node>
+                  <node concept="Xl_RD" id="6IQb_RxKZ4y" role="37wK5m">
+                    <property role="Xl_RC" value="types-model" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="SfApY" id="WJyfsglt8N" role="3cqZAp">
-            <node concept="3clFbS" id="WJyfsglt8O" role="SfCbr">
-              <node concept="3clFbF" id="2zU3cYq$ktZ" role="3cqZAp">
-                <node concept="37vLTI" id="2zU3cYq$k_U" role="3clFbG">
-                  <node concept="2OqwBi" id="2zU3cYq$kSU" role="37vLTJ">
-                    <node concept="Xjq3P" id="2zU3cYq$kHX" role="2Oq$k0" />
-                    <node concept="2OwXpG" id="2zU3cYq$lbF" role="2OqNvi">
-                      <ref role="2Oxat5" node="2zU3cYq$jg9" resolve="model" />
-                    </node>
-                  </node>
-                  <node concept="10QFUN" id="2zU3cYq$lrA" role="37vLTx">
-                    <node concept="3uibUv" id="2zU3cYq$lru" role="10QFUM">
-                      <ref role="3uigEE" to="g3l6:~SModelBase" resolve="SModelBase" />
-                    </node>
-                    <node concept="2OqwBi" id="2zU3cYq$lrv" role="10QFUP">
-                      <node concept="2OqwBi" id="2zU3cYq$lrw" role="2Oq$k0">
-                        <node concept="2YIFZM" id="2zU3cYq$lrx" role="2Oq$k0">
-                          <ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
-                          <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
-                        </node>
-                        <node concept="liA8E" id="2zU3cYq$lry" role="2OqNvi">
-                          <ref role="37wK5l" to="dush:~PersistenceFacade.getDefaultModelFactory():org.jetbrains.mps.openapi.persistence.ModelFactory" resolve="getDefaultModelFactory" />
-                        </node>
-                      </node>
-                      <node concept="liA8E" id="2zU3cYq$lrz" role="2OqNvi">
-                        <ref role="37wK5l" to="dush:~ModelFactory.create(org.jetbrains.mps.openapi.persistence.DataSource,java.util.Map):org.jetbrains.mps.openapi.model.SModel" resolve="create" />
-                        <node concept="37vLTw" id="2zU3cYq$lr$" role="37wK5m">
-                          <ref role="3cqZAo" node="WJyfsglt8z" resolve="source" />
-                        </node>
-                        <node concept="37vLTw" id="2zU3cYq$lr_" role="37wK5m">
-                          <ref role="3cqZAo" node="WJyfsglt8C" resolve="options" />
-                        </node>
-                      </node>
-                    </node>
+          <node concept="3cpWs8" id="6IQb_RxL0KR" role="3cqZAp">
+            <node concept="3cpWsn" id="6IQb_RxL0KS" role="3cpWs9">
+              <property role="TrG5h" value="modelData" />
+              <node concept="3uibUv" id="6IQb_RxL0KP" role="1tU5fm">
+                <ref role="3uigEE" to="w1kc:~SModel" resolve="SModel" />
+              </node>
+              <node concept="2ShNRf" id="6IQb_RxL0KT" role="33vP2m">
+                <node concept="1pGfFk" id="6IQb_RxL0KU" role="2ShVmc">
+                  <ref role="37wK5l" to="w1kc:~SModel.&lt;init&gt;(org.jetbrains.mps.openapi.model.SModelReference)" resolve="SModel" />
+                  <node concept="37vLTw" id="6IQb_RxL0KV" role="37wK5m">
+                    <ref role="3cqZAo" node="6IQb_RxKZ4t" resolve="modelRef" />
                   </node>
                 </node>
               </node>
-              <node concept="3clFbH" id="WJyfsgluob" role="3cqZAp" />
             </node>
-            <node concept="TDmWw" id="WJyfsglt90" role="TEbGg">
-              <node concept="3clFbS" id="WJyfsglt91" role="TDEfX">
-                <node concept="YS8fn" id="WJyfsglxWU" role="3cqZAp">
-                  <node concept="2ShNRf" id="WJyfsglyd9" role="YScLw">
-                    <node concept="1pGfFk" id="WJyfsgl$k5" role="2ShVmc">
-                      <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.Throwable)" resolve="RuntimeException" />
-                      <node concept="37vLTw" id="WJyfsgl$_A" role="37wK5m">
-                        <ref role="3cqZAo" node="WJyfsglt92" resolve="e" />
-                      </node>
-                    </node>
+          </node>
+          <node concept="3clFbF" id="6IQb_RxKQDu" role="3cqZAp">
+            <node concept="37vLTI" id="6IQb_RxKS7D" role="3clFbG">
+              <node concept="2ShNRf" id="6IQb_RxKSkD" role="37vLTx">
+                <node concept="1pGfFk" id="6IQb_RxKSRh" role="2ShVmc">
+                  <ref role="37wK5l" node="6IQb_RxJsDG" resolve="TypesModelManager.TypesModelBase" />
+                  <node concept="37vLTw" id="6IQb_RxL1eS" role="37wK5m">
+                    <ref role="3cqZAo" node="6IQb_RxL0KS" resolve="modelData" />
                   </node>
                 </node>
               </node>
-              <node concept="3cpWsn" id="WJyfsglt92" role="TDEfY">
-                <property role="TrG5h" value="e" />
-                <node concept="3uibUv" id="WJyfsglt93" role="1tU5fm">
-                  <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
+              <node concept="2OqwBi" id="6IQb_RxKQQb" role="37vLTJ">
+                <node concept="Xjq3P" id="6IQb_RxKQDs" role="2Oq$k0" />
+                <node concept="2OwXpG" id="6IQb_RxKRn5" role="2OqNvi">
+                  <ref role="2Oxat5" node="2zU3cYq$jg9" resolve="model" />
                 </node>
               </node>
             </node>
@@ -1035,29 +730,208 @@
           <ref role="3uigEE" to="g3l6:~SModelBase" resolve="SModelBase" />
         </node>
       </node>
-      <node concept="312cEg" id="2zU3cYq$H4C" role="jymVt">
-        <property role="TrG5h" value="module" />
-        <node concept="3Tm6S6" id="2zU3cYq$H4D" role="1B3o_S" />
-        <node concept="3uibUv" id="2zU3cYq$I1V" role="1tU5fm">
-          <ref role="3uigEE" to="31cb:~SModuleBase" resolve="SModuleBase" />
-        </node>
-      </node>
       <node concept="312cEg" id="4Z$O9mrSM0j" role="jymVt">
         <property role="TrG5h" value="registered" />
         <node concept="3Tm6S6" id="4Z$O9mrSM0k" role="1B3o_S" />
         <node concept="10P_77" id="4Z$O9mrSN$Y" role="1tU5fm" />
       </node>
-      <node concept="312cEg" id="2zU3cYq$j_w" role="jymVt">
-        <property role="TrG5h" value="moduleOptions" />
-        <node concept="3Tm6S6" id="2zU3cYq$j_x" role="1B3o_S" />
-        <node concept="3uibUv" id="2zU3cYq$jG1" role="1tU5fm">
-          <ref role="3uigEE" to="tqvn:~TempModuleOptions" resolve="TempModuleOptions" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="2zU3cYq$jGL" role="jymVt" />
       <node concept="3Tm1VV" id="2zU3cYq$91B" role="1B3o_S" />
     </node>
-    <node concept="2tJIrI" id="2zU3cYq$8aK" role="jymVt" />
+    <node concept="2tJIrI" id="6IQb_RxKDA5" role="jymVt" />
+    <node concept="312cEu" id="6IQb_RxJsD_" role="jymVt">
+      <property role="TrG5h" value="TypesModelBase" />
+      <property role="2bfB8j" value="false" />
+      <property role="1sVAO0" value="false" />
+      <property role="1EXbeo" value="false" />
+      <node concept="3Tm6S6" id="6IQb_RxJsDA" role="1B3o_S" />
+      <node concept="3uibUv" id="6IQb_RxPHMV" role="1zkMxy">
+        <ref role="3uigEE" to="g3l6:~EditableSModelBase" resolve="EditableSModelBase" />
+      </node>
+      <node concept="312cEg" id="6IQb_RxJsDC" role="jymVt">
+        <property role="34CwA1" value="false" />
+        <property role="eg7rD" value="false" />
+        <property role="TrG5h" value="myModelData" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="6IQb_RxJsDE" role="1tU5fm">
+          <ref role="3uigEE" to="w1kc:~SModel" resolve="SModel" />
+        </node>
+        <node concept="3Tm6S6" id="6IQb_RxJsDF" role="1B3o_S" />
+      </node>
+      <node concept="3clFbW" id="6IQb_RxJsDG" role="jymVt">
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3cqZAl" id="6IQb_RxJsDH" role="3clF45" />
+        <node concept="37vLTG" id="6IQb_RxJsDI" role="3clF46">
+          <property role="TrG5h" value="modelData" />
+          <property role="3TUv4t" value="false" />
+          <node concept="3uibUv" id="6IQb_RxJsDJ" role="1tU5fm">
+            <ref role="3uigEE" to="w1kc:~SModel" resolve="SModel" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="6IQb_RxJsDK" role="3clF47">
+          <node concept="XkiVB" id="6IQb_RxKzd2" role="3cqZAp">
+            <ref role="37wK5l" to="g3l6:~EditableSModelBase.&lt;init&gt;(org.jetbrains.mps.openapi.model.SModelReference,org.jetbrains.mps.openapi.persistence.DataSource)" resolve="EditableSModelBase" />
+            <node concept="2OqwBi" id="6IQb_RxKyx7" role="37wK5m">
+              <node concept="37vLTw" id="6IQb_RxKyx6" role="2Oq$k0">
+                <ref role="3cqZAo" node="6IQb_RxJsDI" resolve="modelData" />
+              </node>
+              <node concept="liA8E" id="6IQb_RxKyx8" role="2OqNvi">
+                <ref role="37wK5l" to="w1kc:~SModel.getReference():org.jetbrains.mps.openapi.model.SModelReference" resolve="getReference" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="6IQb_RxK_LH" role="37wK5m">
+              <node concept="1pGfFk" id="6IQb_RxKAE2" role="2ShVmc">
+                <ref role="37wK5l" to="dush:~NullDataSource.&lt;init&gt;()" resolve="NullDataSource" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6IQb_RxJsDL" role="3cqZAp">
+            <node concept="37vLTI" id="6IQb_RxJsDM" role="3clFbG">
+              <node concept="37vLTw" id="6IQb_RxJsDN" role="37vLTJ">
+                <ref role="3cqZAo" node="6IQb_RxJsDC" resolve="myModelData" />
+              </node>
+              <node concept="37vLTw" id="6IQb_RxJsDO" role="37vLTx">
+                <ref role="3cqZAo" node="6IQb_RxJsDI" resolve="modelData" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6IQb_RxJsDP" role="3cqZAp">
+            <node concept="2OqwBi" id="6IQb_RxJvBe" role="3clFbG">
+              <node concept="37vLTw" id="6IQb_RxJvBd" role="2Oq$k0">
+                <ref role="3cqZAo" node="6IQb_RxJsDC" resolve="myModelData" />
+              </node>
+              <node concept="liA8E" id="6IQb_RxJvBf" role="2OqNvi">
+                <ref role="37wK5l" to="w1kc:~SModel.setModelDescriptor(org.jetbrains.mps.openapi.model.SModel):void" resolve="setModelDescriptor" />
+                <node concept="Xjq3P" id="6IQb_RxJvBg" role="37wK5m" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6IQb_RxJsDS" role="3cqZAp">
+            <node concept="1rXfSq" id="6IQb_RxJsDT" role="3clFbG">
+              <ref role="37wK5l" to="g3l6:~SModelBase.setLoadingState(jetbrains.mps.smodel.loading.ModelLoadingState):void" resolve="setLoadingState" />
+              <node concept="Rm8GO" id="6IQb_RxKBlx" role="37wK5m">
+                <ref role="Rm8GQ" to="4it6:~ModelLoadingState.FULLY_LOADED" resolve="FULLY_LOADED" />
+                <ref role="1Px2BO" to="4it6:~ModelLoadingState" resolve="ModelLoadingState" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="6IQb_RxJsDY" role="1B3o_S" />
+      </node>
+      <node concept="2tJIrI" id="6IQb_RxKBok" role="jymVt" />
+      <node concept="3clFb_" id="6IQb_RxJsDZ" role="jymVt">
+        <property role="TrG5h" value="getSModelInternal" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="2AHcQZ" id="6IQb_RxJsE0" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="3clFbS" id="6IQb_RxJsE1" role="3clF47">
+          <node concept="3cpWs6" id="6IQb_RxJsE2" role="3cqZAp">
+            <node concept="37vLTw" id="6IQb_RxJsE3" role="3cqZAk">
+              <ref role="3cqZAo" node="6IQb_RxJsDC" resolve="myModelData" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="6IQb_RxJsE4" role="1B3o_S" />
+        <node concept="3uibUv" id="6IQb_RxJsE5" role="3clF45">
+          <ref role="3uigEE" to="w1kc:~SModel" resolve="SModel" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6IQb_RxKBJ_" role="jymVt" />
+      <node concept="3clFb_" id="6IQb_RxJsE6" role="jymVt">
+        <property role="TrG5h" value="getCurrentModelInternal" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="2AHcQZ" id="6IQb_RxJsE7" role="2AJF6D">
+          <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+        </node>
+        <node concept="2AHcQZ" id="6IQb_RxJsE8" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="3clFbS" id="6IQb_RxJsE9" role="3clF47">
+          <node concept="3cpWs6" id="6IQb_RxJsEa" role="3cqZAp">
+            <node concept="37vLTw" id="6IQb_RxJsEb" role="3cqZAk">
+              <ref role="3cqZAo" node="6IQb_RxJsDC" resolve="myModelData" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tmbuc" id="6IQb_RxJsEc" role="1B3o_S" />
+        <node concept="3uibUv" id="6IQb_RxJsEd" role="3clF45">
+          <ref role="3uigEE" to="w1kc:~SModel" resolve="SModel" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6IQb_RxKC6R" role="jymVt" />
+      <node concept="3clFb_" id="6IQb_RxJsEe" role="jymVt">
+        <property role="TrG5h" value="doUnload" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="2AHcQZ" id="6IQb_RxJsEf" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="3clFbS" id="6IQb_RxJsEg" role="3clF47">
+          <node concept="3SKdUt" id="6IQb_RxJsEy" role="3cqZAp">
+            <node concept="3SKdUq" id="6IQb_RxJsEx" role="3SKWNk">
+              <property role="3SKdUp" value="no-op" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tmbuc" id="6IQb_RxJsEh" role="1B3o_S" />
+        <node concept="3cqZAl" id="6IQb_RxJsEi" role="3clF45" />
+      </node>
+      <node concept="2tJIrI" id="6IQb_RxPIQC" role="jymVt" />
+      <node concept="3clFb_" id="6IQb_RxPI6f" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="reloadContents" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3Tmbuc" id="6IQb_RxPI6g" role="1B3o_S" />
+        <node concept="3cqZAl" id="6IQb_RxPI6i" role="3clF45" />
+        <node concept="3clFbS" id="6IQb_RxPI6j" role="3clF47">
+          <node concept="YS8fn" id="6IQb_RxPJlJ" role="3cqZAp">
+            <node concept="2ShNRf" id="6IQb_RxPJns" role="YScLw">
+              <node concept="1pGfFk" id="6IQb_RxPJNI" role="2ShVmc">
+                <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="6IQb_RxPI6k" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6IQb_RxPIws" role="jymVt" />
+      <node concept="3clFb_" id="6IQb_RxPI6l" role="jymVt">
+        <property role="1EzhhJ" value="false" />
+        <property role="TrG5h" value="saveModel" />
+        <property role="DiZV1" value="false" />
+        <property role="od$2w" value="false" />
+        <node concept="3Tmbuc" id="6IQb_RxPI6m" role="1B3o_S" />
+        <node concept="10P_77" id="6IQb_RxPI6o" role="3clF45" />
+        <node concept="3uibUv" id="6IQb_RxPI6p" role="Sfmx6">
+          <ref role="3uigEE" to="guwi:~IOException" resolve="IOException" />
+        </node>
+        <node concept="3uibUv" id="6IQb_RxPI6q" role="Sfmx6">
+          <ref role="3uigEE" to="dush:~ModelSaveException" resolve="ModelSaveException" />
+        </node>
+        <node concept="3clFbS" id="6IQb_RxPI6r" role="3clF47">
+          <node concept="3clFbF" id="6IQb_RxPI6u" role="3cqZAp">
+            <node concept="3clFbT" id="6IQb_RxPI6t" role="3clFbG" />
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="6IQb_RxPI6s" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+      </node>
+      <node concept="3UR2Jj" id="6IQb_RxPLQu" role="lGtFl">
+        <node concept="TZ5HA" id="6IQb_RxPLQv" role="TZ5H$">
+          <node concept="1dT_AC" id="6IQb_RxPLQw" role="1dT_Ay">
+            <property role="1dT_AB" value="Copied from TestModelFactory.TestModelBase." />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="6IQb_RxIEBJ" role="jymVt" />
     <node concept="312cEg" id="WJyfsglZQI" role="jymVt">
       <property role="TrG5h" value="modelOwners" />
       <node concept="3Tm6S6" id="WJyfsglZQJ" role="1B3o_S" />
@@ -1081,7 +955,6 @@
         <ref role="3uigEE" to="lui2:~SRepository" resolve="SRepository" />
       </node>
     </node>
-    <node concept="2tJIrI" id="2zU3cYqxbc_" role="jymVt" />
     <node concept="3Tm1VV" id="2zU3cYqxbbM" role="1B3o_S" />
   </node>
 </model>